diff --git a/eclipse.spec b/eclipse.spec
index faa1def..33c6abf 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -25,9 +25,12 @@
 # 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
+%ifarch x86_64
 %define _unpackaged_files_terminate_build 0
 %endif
+#
+# Define location of the rhaps-develserver installation
+%define rhaps_install	/var/lib/jonas
 
 #
 # Eclipse specs
@@ -35,7 +38,7 @@
 Summary: Eclipse - an open extensible IDE
 Name: eclipse
 Version: 2.1.2
-Release: 6
+Release: 7
 Copyright: Common Public License Version 0.5 <http://www.eclipse.org/legal/cpl-v05.html>
 Group: Development/Tools
 Source: eclipse-src.tar.gz
@@ -59,8 +62,8 @@ 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
+%ifnarch x86_64
+# No lomboz on x86_64 architecture
 %package lomboz
 Summary: Lomboz plugin for Eclipse
 Group: Development/Tools
@@ -72,6 +75,19 @@ The eclipse-lomboz package contains the Lomboz Eclipse plugin,
 a toolkit for J2EE (TM) development.
 %endif
 
+%ifnarch x86_64
+%package rhaps-develserver
+Summary: RHAPS Development Server for Eclipse
+Group: Development/Tools 
+Requires: lomboz jonas
+Copyright: GNU Lesser General Public License <http://www.gnu.org/licenses/lgpl.html>
+
+%description rhaps-develserver
+The eclipse-rhaps-develserver package contains a custom Red Hat Application 
+Server (RHAPS) configuration for use with Eclipse, allowing for easier 
+development and testing of J2EE (TM) applications for deployment on RHAPS.
+%endif
+
 %prep
 %setup -q -c
 # Apply the 64-bit patch for 64-bit platforms only.
@@ -174,6 +190,12 @@ install -D -m 644 plugins/com.redhat.eclipse.oprofile.core.linux/opcontrol-wrapp
 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
 
+%ifnarch x86_64
+# rhaps-develserver install
+mkdir -p ${RPM_BUILD_ROOT}/%{rhaps_install}
+mv ${RPM_BUILD_ROOT}/%{prefix}/rhaps-develserver ${RPM_BUILD_ROOT}/%{rhaps_install}
+%endif
+
 %clean 
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -199,14 +221,24 @@ rm -rf ${RPM_BUILD_ROOT}
 %config(noreplace) /etc/security/console.apps/opcontrol
 %config(noreplace) /etc/pam.d/opcontrol
 
-%ifnarch ia64 x86_64
+%ifnarch x86_64
 # No lomboz on 64 bit architectures
 %files lomboz
 %defattr(-,root,root)
 %{prefix}/plugins/com.objectlearn*
 %endif
 
+%ifnarch x86_64
+%files rhaps-develserver
+%defattr(-,jonas,jonas)
+%{rhaps_install}/rhaps-develserver
+%endif
+
 %changelog
+* Fri Jun 25 2004 Jeremy Handcock <handcock@redhat.com> 2.1.2-7
+- Build Lomboz on ia64
+- Add rhaps-develserver package
+
 * Thu May  6 2004 Jeremy Handcock <handcock@redhat.com> 2.1.2-6
 - Set proper ownership on Lomboz files
 
diff --git a/sources b/sources
index 35c6497..2ac4bf5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-02bd39f54a3cb7b5fbc7765d24e38d09  eclipse-src.tar.gz
+de26969c27b6f40617ab007f0189523d  eclipse-src.tar.gz