diff --git a/eclipse.spec b/eclipse.spec
index 846e245..c67cca3 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -23,7 +23,7 @@ ExclusiveArch: %{ix86} x86_64 ppc
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}_fc
-Release:        0.M6.20
+Release:        0.M6.21
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -108,6 +108,7 @@ BuildRequires:  xorg-x11-devel
 %if %{gcj_support}
 BuildRequires:	gcc-java >= 4.0.0-2
 BuildRequires:	java-1.4.2-gcj-compat-devel >= 1.4.2.0-40jpp_18rh
+BuildRequires:  dos2unix
 %else
 BuildRequires:	java-devel >= 1.4.2
 %endif
@@ -295,10 +296,21 @@ pushd plugins/org.eclipse.jdt.core
 popd
 
 %if %{gcj_support}
-# Fedora splash screen.
-pushd plugins/org.eclipse.platform
-cp %{SOURCE11} splash.bmp
-popd
+  # Fedora splash screen.
+  pushd plugins/org.eclipse.platform
+  cp %{SOURCE11} splash.bmp
+  popd
+
+  # we need to add the ecj-options patch to the bootstrap compiler
+  pushd jdtcoresrc/src
+  unzip jdtcore.zip
+  mv jdtcore.zip{,.orig}
+  dos2unix org/eclipse/jdt/internal/compiler/batch/Main.java
+  dos2unix org/eclipse/jdt/internal/compiler/batch/messages.properties
+%patch25 -p1
+  zip -9 -r jdtcore.zip *
+  rm -r org
+  popd
 %endif
 
 # Remove existing .sos
@@ -431,7 +443,7 @@ ORIGCLASSPATH=$CLASSPATH
       xargs jar cf ../ecj-bootstrap.jar
   popd
   
-  # Delete our modified jdtcore and restore the backup
+  # Delete our modified jdtcore
   rm -rf ecj-bootstrap-tmp
   
   ## 1b. Natively-compile it
@@ -1047,6 +1059,10 @@ fi
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
 
 %changelog
+* Fri May 20 2005 Ben Konrath <bkonrath@redhat.com> 3.1.0_fc-0.M6.21
+- Add ecj-options patch to bootstrap source.
+- Make embedded browser widget work (Robin Green).
+
 * Thu May 19 2005 Ben Konrath <bkonrath@redhat.com> 3.1.0_fc-0.M6.20
 - Add ecj-options patch.