diff --git a/eclipse.spec b/eclipse.spec
index 55b5d78..4b9be55 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -23,12 +23,11 @@ Epoch:	1
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1jpp_8fc
+Release:        1jpp_9fc
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
 Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.1.1-200509290840/eclipse-sourceBuild-srcIncluded-3.1.1.zip
-Source1:        %{name}.script
 Source2:        %{name}.desktop
 Source5:        %{name}-48.png
 Source6:        %{name}.conf
@@ -113,6 +112,9 @@ Patch43:	%{name}-libswt-cairo1.0-3.patch
 Patch44:	%{name}-libswt-cairo1.0-4.patch
 Patch45:	%{name}-webapp-jasperclasspath.patch
 Patch46:	%{name}-libswt-xpcomgcc4.patch
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=79592
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=168726
+Patch47:	%{name}-launcher-link.patch
 
 %if %{gcj_support}
 ExcludeArch: s390 s390x ia64 ppc64
@@ -410,6 +412,7 @@ mkdir launchertmp
 unzip -d launchertmp plugins/org.eclipse.platform/launchersrc.zip
 pushd launchertmp
 %patch37 -p1
+%patch47 -p1
 zip -9 -r ../launchersrc.zip *
 popd
 mv launchersrc.zip plugins/org.eclipse.platform
@@ -417,6 +420,7 @@ rm -rf launchertmp
 
 pushd features/org.eclipse.platform.launchers
 %patch37 -p1
+%patch47 -p1
 popd
 
 %if %{gcj_support}
@@ -745,13 +749,9 @@ popd
 
 # Launching script
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
-perl -pe \
-  's|/usr/lib/eclipse/|%{_libdir}/%{name}/|g ;
-   s|/etc/|%{_sysconfdir}/|g ;
-   s|/usr/bin/|%{_bindir}/|g ;
-   s|/usr/lib/|%{_libdir}/|g' \
-  %{SOURCE1} > $RPM_BUILD_ROOT%{_bindir}/eclipse
-chmod a+x $RPM_BUILD_ROOT%{_bindir}/eclipse
+pushd $RPM_BUILD_ROOT%{_bindir}
+ln -s %{_datadir}/%{name}/%{name}
+popd
 
 # Default config
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
@@ -1284,6 +1284,10 @@ fi
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1
 
 %changelog
+* Wed Dec 07 2005 Andrew Overholt <overholt@redhat.com> 3.1.1-1jpp_9fc
+- Add patch for launcher following symlinks (rh#168726, e.o#79592) - ifoox.
+- Remove launcher script.
+
 * Mon Dec 05 2005 Andrew Overholt <overholt@redhat.com> 3.1.1-1jpp_8fc
 - Add eclipse-rcp-devel as a requirement of eclipse-platform-devel
   (rh#161267).