diff --git a/eclipse.spec b/eclipse.spec
index fc69571..12cdf34 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -699,6 +699,13 @@ for l in `find configuration -name \*.so`; do
           # Add this directory to the files list for libswt
           echo $currentDir | gawk -F '/' '{ print "/"$5"/"$6"/"$7"/"$8"/"$9"/"$10"/"$11 }' > %{_builddir}/%{buildsubdir}/%{libname}-gtk2.install;
         popd
+    else
+        pushd `dirname $l`;
+	  cd ../..;
+	  currentDir=`pwd`;
+          # Add this directory to the files list for libswt
+          echo $currentDir | gawk -F '/' '{ print "/"$5"/"$6"/"$7"/"$8"/"$9"/"$10"/"$11 }' > %{_builddir}/%{buildsubdir}/%{name}-platform.install;
+        popd
     fi
 done
 popd
@@ -763,7 +770,7 @@ install -p -D -m0644 %{SOURCE2} \
 
 cat %{SOURCE7} > %{name}-jdt.install
 cat %{SOURCE8} > %{name}-pde.install
-cat %{SOURCE9} > %{name}-platform.install
+cat %{SOURCE9} >> %{name}-platform.install
 cat %{SOURCE10} >> %{libname}-gtk2.install
 
 cat >> $RPM_BUILD_ROOT%{_datadir}/%{name}/.eclipseproduct << EOF
@@ -1109,7 +1116,13 @@ fi
 %{_libdir}/%{name}/eclipse
 %{_libdir}/%{name}/libcore*
 %{_libdir}/%{name}/libupdate*
-%{_datadir}/%{name}/configuration
+%dir %{_datadir}/%{name}/configuration
+%dir %{_datadir}/%{name}/configuration/org.eclipse.osgi
+%dir %{_datadir}/%{name}/configuration/org.eclipse.osgi/bundles
+# all extracted bundles other than SWT will be in eclipse-platform.install
+%{_datadir}/%{name}/configuration/config.ini
+%{_datadir}/%{name}/configuration/org.eclipse.core.runtime
+%{_datadir}/%{name}/configuration/org.eclipse.update
 %{_datadir}/%{name}/eclipse
 %{_bindir}/eclipse
 %{_datadir}/applications/*