diff --git a/eclipse-swt-buildagainstxulrunner.patch b/eclipse-swt-buildagainstxulrunner.patch
index dba9f54..c520b24 100644
--- a/eclipse-swt-buildagainstxulrunner.patch
+++ b/eclipse-swt-buildagainstxulrunner.patch
@@ -3,13 +3,23 @@
 Index: Eclipse SWT PI/gtk/library/build.sh
 ===================================================================
 RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh,v
-retrieving revision 1.50
-diff -u -r1.50 build.sh
---- Eclipse SWT PI/gtk/library/build.sh	23 Jan 2009 23:22:21 -0000	1.50
-+++ Eclipse SWT PI/gtk/library/build.sh	5 Mar 2009 20:41:43 -0000
-@@ -107,11 +107,11 @@
+retrieving revision 1.48
+diff -u -r1.48 build.sh
+--- Eclipse SWT PI/gtk/library/build.sh	5 Jun 2008 17:31:51 -0000	1.48
++++ Eclipse SWT PI/gtk/library/build.sh	6 Apr 2009 21:11:22 -0000
+@@ -96,19 +96,19 @@
+ 		MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom`
+ 		export MOZILLA_INCLUDES
  		export MOZILLA_LIBS
- 		MAKE_MOZILLA=make_mozilla
+-		MAKE_MOZILLA=make_mozilla
++		MAKE_MOZILLA="make_mozilla make_xpcominit"
+ 	elif [ x`pkg-config --exists firefox-xpcom && echo YES` = "xYES" ]; then
+ 		MOZILLA_INCLUDES=`pkg-config --cflags firefox-xpcom`
+ 		MOZILLA_LIBS=`pkg-config --libs firefox-xpcom`
+ 		export MOZILLA_INCLUDES
+ 		export MOZILLA_LIBS
+-		MAKE_MOZILLA=make_mozilla
++		MAKE_MOZILLA="make_mozilla make_xpcominit"
  	elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
 -		MOZILLA_INCLUDES=`pkg-config --cflags libxul`
 -		MOZILLA_LIBS=`pkg-config --libs libxul`
@@ -17,10 +27,10 @@ diff -u -r1.50 build.sh
 -		export MOZILLA_LIBS
 -		MAKE_MOZILLA=make_mozilla
 +		XULRUNNER_INCLUDES=`pkg-config --cflags libxul`
-+		XULRUNNER_LIBS=`pkg-config --libs libxul`
++		XULRUNNER_LIBS="`pkg-config --libs libxul` -lxpcomglue"
 +		export XULRUNNER_INCLUDES
 +		export XULRUNNER_LIBS
-+		MAKE_MOZILLA=make_xulrunner
++		MAKE_MOZILLA="make_xulrunner make_xpcominit"
  	else
  		echo "None of the following libraries were found:  Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM"
  		echo "    *** Mozilla embedding support will not be compiled."
diff --git a/eclipse.spec b/eclipse.spec
index 4c65bcd..91d8a1e 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -29,7 +29,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        8%{?dist}
+Release:        9%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -149,7 +149,11 @@ Patch44:		%{name}-fix-javahome64.patch
 
 # Since we're building against XULRunner, build using XR flags
 # https://bugs.eclipse.org/226356
-# https://bugzilla.redhat.com/show_bug.cgi?id=484453
+# https://bugs.eclipse.org/bugs/attachment.cgi?id=131059
+# At present, libxul.pc contains -lxpcomglue_s.  Chris Aillon and myself think
+# it should perhaps be -lxpcomglue.  This patch uses that instead but will
+# be replaced with the former when libxul.pc is fixed.
+# https://bugs.eclipse.org/bugs/attachment.cgi?id=131060
 Patch45:        %{name}-swt-buildagainstxulrunner.patch
 # Work with changed interface in XULRunner 1.9.1
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=268651
@@ -356,9 +360,9 @@ popd
 #%patch40
 #popd
 
-#pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
-#%patch45 -p3
-#popd
+pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
+%patch45 -p3
+popd
 pushd plugins/org.eclipse.swt
 %patch46
 popd
@@ -1487,6 +1491,11 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Apr 6 2009 Andrew Overholt <overholt@redhat.com> 1:3.4.2-9
+- Re-add patch to build libswt-xulrunner instead of libswt-mozilla.
+- RHBZ#484453
+- Eclipse.org BZ#226356
+
 * Mon Apr 6 2009 Alexander Kurtakov <akurtako@redhat.com> 1:3.4.2-8
 - Fix jdt owning dropins/jdt folder.