diff --git a/eclipse-buildagainstxulrunner.patch b/eclipse-buildagainstxulrunner.patch
new file mode 100644
index 0000000..d2835d1
--- /dev/null
+++ b/eclipse-buildagainstxulrunner.patch
@@ -0,0 +1,25 @@
+### Eclipse Workspace Patch 1.0
+#P org.eclipse.swt
+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.46
+diff -u -r1.46 build.sh
+--- Eclipse SWT PI/gtk/library/build.sh	22 Oct 2007 21:18:51 -0000	1.46
++++ Eclipse SWT PI/gtk/library/build.sh	9 Apr 2008 19:45:37 -0000
+@@ -103,8 +103,14 @@
+ 		export MOZILLA_INCLUDES
+ 		export MOZILLA_LIBS
+ 		MAKE_MOZILLA=make_mozilla
++	elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
++		MOZILLA_INCLUDES=`pkg-config --cflags libxul`
++		MOZILLA_LIBS=`pkg-config --libs libxul`
++		export MOZILLA_INCLUDES
++		export MOZILLA_LIBS
++		MAKE_MOZILLA=make_mozilla
+ 	else
+-		echo "Mozilla/XPCOM or Firefox/XPCOM libraries not found:"
++		echo "None of the following libraries were found:  Mozilla/XPCOM, Firefox/XPCOM, or xulrunner/XPCOM"
+ 		echo "    *** Mozilla embedding support will not be compiled."
+ 	fi
+ fi
\ No newline at end of file
diff --git a/eclipse.spec b/eclipse.spec
index 84469a8..3c0c4ba 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -20,7 +20,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        6%{?dist} 
+Release:        7%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -88,6 +88,8 @@ Patch27:        %{name}-17vmgenerate16bytecode.patch
 Patch29:        %{name}-maxpermsize.patch
 
 Patch31:	%{name}-ia64-packaging.patch
+# https://bugs.eclipse.org/226356
+Patch32:	%{name}-buildagainstxulrunner.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
@@ -115,7 +117,6 @@ BuildRequires:  java-gcj-compat-devel >= 1.0.64
 BuildRequires:  libXt-devel
 %else
 BuildRequires:  java-devel >= 1.6.0
-BuildRequires:  java-javadoc >= 1.6.0
 BuildRequires:  libXt-devel
 %endif
 
@@ -264,8 +265,9 @@ Requires:       junit >= 3.8.1-3jpp
 Requires:       junit4
 %if %{gcj_support}
 Requires:       java-javadoc
-%else
-Requires:       java-javadoc >= 1.6.0
+# OpenJDK doesn't Provide this.  Should file a bug.
+#%else
+#Requires:       java-javadoc >= 1.6.0
 %endif
 %if %{gcj_support}
 Requires(post):     java-gcj-compat >= 1.0.64
@@ -611,6 +613,12 @@ for plugin in jdt.apt.pluggable.core jdt.compiler.tool jdt.compiler.apt; do
   sed --in-place -e "$(expr $linenum - 2),$(expr $linenum + 1)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml
 done
 
+# Build mozilla bindings against xulrunner
+pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI
+%patch32 -p3
+popd
+
+
 # link to the jsch jar
 rm plugins/com.jcraft.jsch_0.1.31.jar
 ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_0.1.31.jar
@@ -1638,6 +1646,11 @@ fi
 %endif
 
 %changelog
+* Wed Apr 09 2008 Andrew Overholt <overholt@redhat.com> 3.3.2-7
+- Remove explicit java-javadoc requirements as OpenJDK's -devel package
+  provides it.
+- Patch SWT build to find libxul.pc.
+
 * Fri Apr 04 2008 Andrew Overholt <overholt@redhat.com> 3.3.2-6
 - Fix path of pdebuild in %%files.  Gah.