diff --git a/eclipse.spec b/eclipse.spec
index 651f201..2a4dfc7 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -21,6 +21,13 @@
 %define gcj_build	true
 # Define as true to build .class files with ecj.
 %define ecj_build	true
+#
+# A hack to work around build script deficiencies on 64-bit platforms.
+# On those we don't ship Lomboz, and it is simpler to just tell rpm
+# to ignore problems.
+%ifarch ia64 x86_64
+%define _unpackaged_files_terminate_build 0
+%endif
 
 #
 # Eclipse specs
@@ -28,7 +35,7 @@
 Summary: Eclipse - an open extensible IDE
 Name: eclipse
 Version: 2.1.2
-Release: 3
+Release: 4
 Copyright: Common Public License Version 0.5 <http://www.eclipse.org/legal/cpl-v05.html>
 Group: Development/Tools
 Source: eclipse-src.tar.gz
@@ -54,15 +61,18 @@ environments (IDEs) that can be used to create applications as diverse
 as web sites, embedded Java (TM) programs, C++ programs, and Enterprise
 JavaBeans (TM).
 
+%ifnarch ia64 x86_64
+# No lomboz on 64 bit architectures
 %package lomboz
 Summary: Lomboz plugin for Eclipse
 Group: Development/Tools
-Requires: eclipse IBMJava2-JRE IBMJava2-SDK
+Requires: eclipse java-1.4.1-ibm java-1.4.1-ibm-devel
 Copyright: GNU Lesser General Public License <http://www.gnu.org/licenses/lgpl.html>
 
 %description lomboz
 The eclipse-lomboz package contains the Lomboz Eclipse plugin,
 a toolkit for J2EE (TM) development.
+%endif
 
 %prep
 %setup -q -c
@@ -162,13 +172,15 @@ test -f ${RPM_BUILD_ROOT}/`sed -n 's/^Icon=//p' eclipse.desktop`
 
 
 # oprofile install
-ln -s /usr/bin/consolehelper ${RPM_BUILD_ROOT}%{prefix}/plugins/com.redhat.eclipse.oprofile.core.linux_1.0.0/opcontrol
+# (We don't link consolehelper since gcj's URL has some issues with locating links.)
+#ln -s /usr/bin/consolehelper ${RPM_BUILD_ROOT}%{prefix}/plugins/com.redhat.eclipse.oprofile.core.linux_1.0.0/opcontrol
 install -D -m 644 plugins/com.redhat.eclipse.oprofile.core.linux/opcontrol-wrapper.security ${RPM_BUILD_ROOT}/etc/security/console.apps/opcontrol
 install -D -m 644 plugins/com.redhat.eclipse.oprofile.core.linux/opcontrol-wrapper.pamd ${RPM_BUILD_ROOT}/etc/pam.d/opcontrol
 
 # Note the "*": this is simpler than guessing the arch name that
 # eclipse uses.
 chmod +x ${RPM_BUILD_ROOT}/%{prefix}/plugins/com.redhat.eclipse.oprofile.core.linux_1.0.0/os/linux/*/opxml
+chmod +x ${RPM_BUILD_ROOT}/%{prefix}/plugins/com.redhat.eclipse.oprofile.core.linux_1.0.0/opcontrol
 
 %clean 
 rm -rf ${RPM_BUILD_ROOT}
@@ -195,10 +207,16 @@ rm -rf ${RPM_BUILD_ROOT}
 %config(noreplace) /etc/security/console.apps/opcontrol
 %config(noreplace) /etc/pam.d/opcontrol
 
+%ifnarch ia64 x86_64
+# No lomboz on 64 bit architectures
 %files lomboz
 %{prefix}/plugins/com.objectlearn*
+%endif
 
 %changelog
+* Tue Mar 16 2004 Tom Tromey <tromey@redhat.com> 2.1.2-4
+- Removed Lomboz from 64-bit architectures
+
 * Fri Mar  5 2004 Tom Tromey <tromey@redhat.com> 2.1.2-3
 - Added ppc hacks
 - Bug fixes in source tar
diff --git a/sources b/sources
index 6f93cac..e4bf7aa 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-fbd7a2251229d717bbc10398e75ac648  eclipse-src.tar.gz
+28251826e4197cfbd6286ea480185909  eclipse-src.tar.gz
 ad970f14619cae43e3cca6dc3a655edf  eclipse-webapp-prebuilt.tar.gz