diff --git a/eclipse.spec b/eclipse.spec
index 151d33a..dfac592 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -645,6 +645,18 @@ popd
   find plugins -type f -name \*.xml -exec sed --in-place "s/\(<antcall target=\"build.index\".*\/>\)/<\!-- \1 -->/" "{}" \;
 %endif
 
+# the swt version is set to HEAD on ia64 but shouldn't be
+# FIXME: file a bug about this
+# get swt version
+SWT_MAJ_VER=$(grep maj_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
+SWT_MIN_VER=$(grep min_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
+SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
+swt_frag_ver=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.x86/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:")
+swt_frag_ver_ia64=$(grep "version\.suffix\" value=" plugins/org.eclipse.swt.gtk.linux.ia64/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:")
+sed --in-place "s/$swt_frag_ver_ia64/$swt_frag_ver/g" plugins/org.eclipse.swt.gtk.linux.ia64/build.xml \
+						      assemble.org.eclipse.sdk.linux.gtk.ia64.xml \
+						      features/org.eclipse.rcp/build.xml
+
 # nasty hack to get suppport for ppc64, s390(x) and sparc(64)
 # move all of the ia64 directories to ppc64 or s390(x) or sparc(64) dirs and replace 
 # the ia64 strings with ppc64 or s390(x)
@@ -816,8 +828,7 @@ SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
 
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-tar -C $RPM_BUILD_ROOT%{_datadir} -zxf \
-  result/linux-gtk-%{eclipse_arch}-sdk.tar.gz
+tar -C $RPM_BUILD_ROOT%{_datadir} -zxf result/linux-gtk-%{eclipse_arch}-sdk.tar.gz
 
 pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
 
@@ -937,11 +948,8 @@ desktop-file-validate %{SOURCE2}
 install -p -D -m0644 %{SOURCE2} \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-cat >> $RPM_BUILD_ROOT%{_datadir}/%{name}/.eclipseproduct << EOF
-name=Eclipse Platform
-id=org.eclipse.platform
-version=%{eclipse_majmin}.%{eclipse_micro}
-EOF
+sed --in-place "s/eclipse.product=org.eclipse.sdk.ide/#eclipse.product=/" \
+  $RPM_BUILD_ROOT%{eclipse_base}/configuration/config.ini
 
 %if %{fedora}
 # Put Fedora Core version into about.mappings of org.eclipse.sdk to show it in
@@ -1123,6 +1131,8 @@ touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
+sed --in-place "s/#eclipse.product=/eclipse.product=org.eclipse.platform.ide/" \
+  %{eclipse_base}/configuration/config.ini
 
 %postun platform
 %if %{gcj_support}
@@ -1132,6 +1142,8 @@ touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
+sed --in-place "s/eclipse.product=org.eclipse.platform.ide/#eclipse.product=/" \
+  %{eclipse_base}/configuration/config.ini
 
 %if %{gcj_support}
 %post ecj -p %{_bindir}/rebuild-gcj-db
@@ -1154,10 +1166,22 @@ fi
 %postun pde-runtime -p %{_bindir}/rebuild-gcj-db
 %post pde-sdk -p %{_bindir}/rebuild-gcj-db
 %postun pde-sdk -p %{_bindir}/rebuild-gcj-db
-%post sdk -p %{_bindir}/rebuild-gcj-db
-%postun sdk -p %{_bindir}/rebuild-gcj-db
 %endif
 
+%post sdk 
+%if %{gcj_support}
+%{_bindir}/rebuild-gcj-db
+%endif
+sed --in-place "s/eclipse.product=org.eclipse.platform.ide/eclipse.product=org.eclipse.sdk.ide/" \
+  %{eclipse_base}/configuration/config.ini
+
+%postun sdk 
+%if %{gcj_support}
+%{_bindir}/rebuild-gcj-db
+%endif
+sed --in-place "s/eclipse.product=org.eclipse.sdk.ide/eclipse.product=org.eclipse.platform.ide/" \
+  %{eclipse_base}/configuration/config.ini
+
 %files ecj
 %defattr(-,root,root)
 %dir %{_datadir}/%{name}
@@ -1267,11 +1291,6 @@ fi
 %ifarch %{ix86} x86_64
 %{_libdir}/%{name}/liblocalfile*
 %endif
-# This is all from our FileInitializer extraction of .sos
-# all extracted bundles other than SWT will be in eclipse-platform.install
-%dir %{_datadir}/%{name}/configuration
-%dir %{_datadir}/%{name}/configuration/org.eclipse.osgi
-%dir %{_datadir}/%{name}/configuration/org.eclipse.osgi/bundles
 %{_datadir}/%{name}/configuration/org.eclipse.osgi/.bundledata*
 %{_datadir}/%{name}/configuration/org.eclipse.osgi/.lazy*
 %{_datadir}/%{name}/configuration/org.eclipse.osgi/.manager
@@ -1485,6 +1504,14 @@ fi
 %{_datadir}/%{name}/plugins/org.eclipse.sdk_*
 
 %changelog
+* Thu Sep 21 2006 Ben Konrath <bkonrath@redhat.com> 3.2.0-7
+- Use real SWT version on ia64, ppc64, s390 and s390x.
+- Remove the swt native libs from the rcp sub-package because they are 
+  already in the libswt-gtk2 sub-package and rcp requires libswt-gtk2.
+- Set correct eclipse.product in post and postun of sdk and platform
+  sub-packages (rh bug # 207442)
+- Don't set the .eclipseproduct twice.
+
 * Thu Sep 21 2006 Andrew Overholt <overholt@redhat.com> 3.2.0-7
 - Add workaround for gjdoc Mac-encoded bug (gcc#29167) to make javadocs build.
 - Fix tomcat symlinking in %%install to make help work (rh#199453).