diff --git a/.cvsignore b/.cvsignore
index 1f29622..35a2951 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
-eclipse-fedora-splash-3.2.png
 icu4jsrc_3_4_5.jar
 eclipse-sourceBuild-srcIncluded-3.2.1.zip
+eclipse-fedora-splash-3.2.1.png
diff --git a/eclipse.spec b/eclipse.spec
index 20d912d..0eb3c4a 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -6,13 +6,7 @@
 
 Epoch:	1
 
-%define fedora		1
-%define redhat		0
-%if %{fedora}
 %define gcj_support 	1
-%else
-%define gcj_support 	0
-%endif
 %define tomcatsharedir 	%{_datadir}/tomcat5
 %define tomcatlibdir 	%{_var}/lib/tomcat5
 %define section         free
@@ -32,7 +26,7 @@ Epoch:	1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        9%{?dist} 
+Release:        10%{?dist} 
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -41,12 +35,7 @@ Source2:        %{name}.desktop
 Source5:        %{name}-48.png
 # FIXME: this should be in its own package
 Source7: 	ftp://ftp.software.ibm.com/software/globalization/icu/icu4j/3.4.5/icu4jsrc_3_4_5.jar
-%if %{fedora}
-Source11:	%{name}-fedora-splash-3.2.png
-%endif
-%if %{redhat}
-Source11:	%{name}-redhat-splash-3.2.png
-%endif
+Source11:	%{name}-fedora-splash-3.2.1.png
 Source16:       %{name}-copy-platform.sh
 Source17:       efj.sh.in
 Source18:	ecj.sh.in
@@ -826,10 +815,10 @@ popd
   mkdir ecj-bootstrap-tmp
   unzip -qq -d ecj-bootstrap-tmp jdtcoresrc/src/ecj.zip
   rm -f ecj-bootstrap-tmp/org/eclipse/jdt/core/JDTCompilerAdapter.java
-  
+
   # 1a. Build ecj with gcj -C
   pushd ecj-bootstrap-tmp
-  for f in `find -name '*.java' | cut -c 3-`; do
+  for f in `find -name '*.java' | cut -c 3- | sort`; do
       gcj -Wno-deprecated -C $f
   done
   find -name '*.class' -or -name '*.properties' -or -name '*.rsc' |\
@@ -1036,7 +1025,6 @@ desktop-file-validate %{SOURCE2}
 # freedesktop.org menu entry
 install -p -D -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-%if %{fedora}
 # Put Fedora Core version into about.mappings of org.eclipse.sdk and
 # org.eclipse.platform to show it in # Eclipse about dialog.  (courtesy Debian
 # Eclipse packagers)
@@ -1050,7 +1038,6 @@ pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.platform_%{eclipse_
 sed -e "s/\(0=.*\)/\1 ($FEDORA_VERSION)/" < about.mappings > about.mappings.tmp
 mv about.mappings.tmp about.mappings
 popd
-%endif
 
 # Create a script that can be used to make a symlink tree of the
 # eclipse platform.
@@ -1629,6 +1616,12 @@ rm -f %{_datadir}/%{name}/configuration/org.eclipse.update/platform.xml*
 %{_datadir}/%{name}/plugins/org.eclipse.sdk_*
 
 %changelog
+* Tue Oct 31 2006 Ben Konrath <bkonrath@redhat.com> 3.2.1-10
+- Add 3.2.1 splash screen.
+- Sort the java source files before building (#209249).
+- Remove Fedora ifdefs.
+- Resolves: #209249.
+
 * Tue Oct 31 2006 Ben Konrath <bkonrath@redhat.com> 3.2.1-9
 - Re-enable building of the icu4j plugins.
 
diff --git a/sources b/sources
index 14e0615..75b0eaa 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-a86209ba94fc9ccdda63a781bd4ea0d8  eclipse-fedora-splash-3.2.png
 c3be75d8af3c31b7a1748247ab3fee95  icu4jsrc_3_4_5.jar
 0fe89e9c7cf07a56c4fe8e2d7f5a394b  eclipse-sourceBuild-srcIncluded-3.2.1.zip
+627db0c5033547a48370a5e45a89d2f1  eclipse-fedora-splash-3.2.1.png