diff --git a/eclipse.spec b/eclipse.spec
index 2e68cc0..473ccdf 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -22,7 +22,7 @@ Epoch:	1
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1jpp_3fc
+Release:        1jpp_4fc
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -94,6 +94,7 @@ Patch36:	%{name}-ecj-classpath.patch
 Patch37:	%{name}-gre64.conf.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=114001
 Patch38:	%{name}-helpindexbuilder.patch
+Patch40:	%{name}-usebuiltlauncher.patch
 # Build cairo libs
 # Again, I hate patches with spaces in the filenames
 Patch41:	%{name}-libswt-cairo1.0-1.patch
@@ -378,6 +379,7 @@ popd
 %patch35 -p0
 %patch36 -p1
 %patch38 -p0
+%patch40 -p0
 # Again, I hate spaces in patches
 pushd plugins/org.eclipse.swt/Eclipse\ SWT/
 %patch41 -p0
@@ -514,10 +516,7 @@ rm -f *.jar
 pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
 # /usr/lib -> /usr/lib64
 sed --in-place "s:/usr/lib/:%{_libdir}/:g" build.sh
-%if %{gcj_support}
-  # link against gcj's jawt implementation.
-  sed --in-place "s/-ljawt/-lgcjawt/" make_linux.mak
-%endif
+sed --in-place "s:-L\$(AWT_LIB_PATH):-L%{_jvmdir}/java/jre/lib/%{_arch}:" make_linux.mak
 popd
 
 
@@ -715,7 +714,11 @@ done
 popd
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 pushd $RPM_BUILD_ROOT%{_javadir}
-ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
+#ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
+#ln -sf %{_javadir}/swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk.jar
+# SWT is still a 3.1.1 jar ... (rh#180000)
+ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.1.1.jar swt-gtk-3.1.1.jar
+ln -sf %{_javadir}/swt-gtk-3.1.1.jar swt-gtk.jar
 popd
 ### end libswt-gtk2 symlinks
 
@@ -1255,6 +1258,11 @@ fi
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_%{version}
 
 %changelog
+* Mon Feb 06 2006 Andrew Overholt <overholt@redhat.com> 3.1.2-1jpp_4fc
+- Add an swt-gtk.jar and fix symlink to point to correct jar (rh#180000).
+- Link against generic libjawt.so (rh#158755).
+- Re-add patch to use built launcher.
+
 * Sat Feb 4 2006 Ben Konrath <bkonrath@redhat.com> 3.1.2-1jpp_3fc
 - Update efj patches to match what has been committed to HEAD.