diff --git a/eclipse.spec b/eclipse.spec
index 888094f..95f2bf9 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -27,8 +27,8 @@
 #
 Summary: Eclipse - an open extensible IDE
 Name: eclipse
-Version: 2.1.0
-Release: 22
+Version: 2.1.1
+Release: 3
 Copyright: Common Public License Version 0.5 <http://www.eclipse.org/legal/cpl-v05.html>
 Group: Development/Tools
 Source: eclipse-src.tar.gz
@@ -58,9 +58,14 @@ target=buildAll
 build_options="-os linux -ws gtk -bc %{java_runtime}"
 
 if %{gcj_build}; then
-  export JAVACMD=%{java_bin}/gij-ssa
-  export GCJ=gcj-ssa
-  export CC=gcc-ssa
+  : ${JAVACMD=%{java_bin}/gij-ssa}
+  : ${GCJ_BOOTSTRAP=gcj-ssa}
+  : ${GCJ=gcj-ssa}
+  : ${CC=gcc-ssa}
+  export JAVACMD
+  export GCJ_BOOTSTRAP
+  export GCJ
+  export CC
   target=gcjBuild
 fi
 
@@ -69,6 +74,7 @@ if %{ecj_build}; then
 fi
 
 ./build -target $target $build_options
+./build -target buildAllSources $build_options
 
 # A sanity check.
 desktop-file-validate eclipse.desktop
@@ -91,6 +97,7 @@ if %{ecj_build}; then
 fi
 
 ./build -target zip.distribution  $build_options
+./build -target zip.sources  $build_options
 
 rm -rf scratch
 mkdir -p scratch
@@ -112,6 +119,9 @@ install -D eclipse-start ${RPM_BUILD_ROOT}%{_bindir}/eclipse
 
 install -D eclipse.desktop ${RPM_BUILD_ROOT}%{_datadir}/applications/eclipse.desktop
 
+# Some extra checking that the desktop file validator doesn't do.
+test -f ${RPM_BUILD_ROOT}/`sed -n 's/^Icon=//p' eclipse.desktop`
+
 # Symlink to JRE.
 # ln -s %{java_jre} ${RPM_BUILD_ROOT}%{prefix}/java
 
@@ -134,6 +144,22 @@ rm -rf ${RPM_BUILD_ROOT}
 %config(noreplace) /etc/pam.d/opcontrol-wrapper
 
 %changelog
+* Thu Nov 13 2003 Tom Tromey <tromey@redhat.com> 2.1.1-3
+- Work around PPC compiler bug by allowing .jar compilations to fail
+
+* Mon Nov 10 2003 Tom Tromey <tromey@redhat.com> 2.1.1-2
+- Invoke buildAllSources and zip.sources; bugzilla 109651
+
+* Fri Oct 24 2003 Diego Novillo <dnovillo@redhat.com> 2.1.1-1
+- Add env var GCJ_BOOTSTRAP.  Allow GCJ_BOOTSTRAP, GCJ and CC to be
+  overridden
+
+* Mon Oct 20 2003 Tom Tromey <tromey@redhat.com> 2.1.1-1
+- Ensure that icon exists
+
+* Tue Oct  7 2003 Tom Tromey <tromey@redhat.com> 2.1.1-1
+- Updated to 2.1.1
+
 * Mon Sep 29 2003 Tom Tromey <tromey@redhat.com> 2.1.0-22
 - Updated upstream sources; oprofile plugin works
 
diff --git a/sources b/sources
index f6ad47e..cf4461f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0450fd32202dea114fbef8bdf4d5a6d7  eclipse-src.tar.gz
+11f4d8a0bf6e1bbfa9feda27f3b449bc  eclipse-src.tar.gz