diff --git a/eclipse.spec b/eclipse.spec
index 8fade5a..d569d17 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -3,6 +3,7 @@
 # - look at startup script and launcher patches
 # - update stuff for building on secondary arches
 # - get Ganymede update site pre-configured
+# - investigate bi-arch requirements
 Epoch:  1
 
 %define eclipse_major   3
@@ -1089,10 +1090,6 @@ fi
 %{_libdir}/%{name}/configuration/org.eclipse.osgi/.state*
 %{_libdir}/%{name}/configuration/config.ini
 # FIXME:  where should this go?
-%{_libdir}/%{name}/artifacts.xml
-# FIXME:  where should this go?
-%{_libdir}/%{name}/metadata
-# FIXME:  where should this go?
 %{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator
 %{_libdir}/%{name}/notice.html
 %{_libdir}/%{name}/epl-v10.html
@@ -1120,7 +1117,6 @@ fi
 %{_libdir}/%{name}/plugins/org.eclipse.jface.databinding_*
 %{_libdir}/%{name}/plugins/org.eclipse.osgi_*
 %{_libdir}/%{name}/plugins/org.eclipse.rcp_*
-%{_libdir}/%{name}/plugins/org.eclipse.swt_*
 %{_libdir}/%{name}/plugins/org.eclipse.ui_*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_*
 %{_libdir}/%{name}/plugins/org.eclipse.update.configurator_*
@@ -1214,29 +1210,9 @@ fi
 %{_libdir}/%{name}/features/org.eclipse.cvs_*
 %{_libdir}/%{name}/features/org.eclipse.help_*
 %{_libdir}/%{name}/plugins/org.apache.jasper_*
-
-%files jdt
-%defattr(-,root,root)
-%{_bindir}/efj
-%{_libdir}/%{name}/features/org.eclipse.jdt_*
-%{_libdir}/%{name}/plugins/org.eclipse.ant.ui_*
-%{_libdir}/%{name}/plugins/org.junit_*
-%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit_*
-%{_libdir}/%{name}/plugins/org.eclipse.jdt.doc.user_*
-%{_libdir}/%{name}/plugins/org.eclipse.jdt.apt.core_*
-%{_libdir}/%{name}/plugins/org.eclipse.jdt.ui_*
-%{_libdir}/%{name}/plugins/org.eclipse.jdt.debug_*
-%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit4.runtime_*
-%{_libdir}/%{name}/plugins/org.junit4_*
-%{_libdir}/%{name}/plugins/org.eclipse.jdt_*
-%{_libdir}/%{name}/plugins/org.eclipse.jdt.launching_*
-%{_libdir}/%{name}/plugins/org.eclipse.jdt.core.manipulation_*
-%{_libdir}/%{name}/plugins/org.eclipse.jdt.apt.ui_*
-%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit.runtime_*
-%{_libdir}/%{name}/plugins/org.eclipse.jdt.debug.ui_*
-%{_libdir}/%{name}/plugins/org.eclipse.jdt.apt.pluggable.core_*
-%{_libdir}/%{name}/plugins/org.eclipse.jdt.compiler.apt_*
-%{_libdir}/%{name}/plugins/org.eclipse.jdt.compiler.tool_*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.frameworkadmin_*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.frameworkadmin.equinox_*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_*
 %{_libdir}/%{name}/features/org.eclipse.equinox.p2.user.ui_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.director_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.core_*
@@ -1248,10 +1224,7 @@ fi
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.exemplarysetup_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.touchpoint.eclipse_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.touchpoint.natives_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.frameworkadmin_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.frameworkadmin.equinox_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.console_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui.sdk_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.updatechecker_*
@@ -1270,11 +1243,34 @@ fi
 %{_libdir}/%{name}/plugins/org.eclipse.ecf_*
 %{_libdir}/%{name}/plugins/org.eclipse.ecf.filetransfer_*
 %{_libdir}/%{name}/plugins/org.eclipse.ecf.identity_*
-# FIXME:  These need to be symlinks
-# SAT4J review request:
-# https://bugzilla.redhat.com/show_bug.cgi?id=453781
 %{_libdir}/%{name}/plugins/org.sat4j.core_*
 %{_libdir}/%{name}/plugins/org.sat4j.pb_*
+# Put this in -platform since we're putting the p2 stuff here
+%{_libdir}/%{name}/artifacts.xml
+%{_libdir}/%{name}/metadata
+
+%files jdt
+%defattr(-,root,root)
+%{_bindir}/efj
+%{_libdir}/%{name}/features/org.eclipse.jdt_*
+%{_libdir}/%{name}/plugins/org.eclipse.ant.ui_*
+%{_libdir}/%{name}/plugins/org.junit_*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit_*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.doc.user_*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.apt.core_*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.ui_*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.debug_*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit4.runtime_*
+%{_libdir}/%{name}/plugins/org.junit4_*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt_*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.launching_*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.core.manipulation_*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.apt.ui_*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit.runtime_*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.debug.ui_*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.apt.pluggable.core_*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.compiler.apt_*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.compiler.tool_*
 
 %files pde
 %defattr(-,root,root)
@@ -1330,6 +1326,9 @@ fi
 
 %changelog
 * Wed Jul 16 2008 Andrew Overholt <overholt@redhat.com> 3.4.0-1
+- Fix files lists
+
+* Wed Jul 16 2008 Andrew Overholt <overholt@redhat.com> 3.4.0-1
 - Update branding
 - Fix p2 stuff so p2 UI works