diff --git a/eclipse.spec b/eclipse.spec
index 9f6fe84..b558db7 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -695,27 +695,45 @@ for l in `find configuration -name \*.so`; do
     if [ "`basename $l`" = "libswt-gtk-%{swt_version}.so" ]
     then
         pushd `dirname $l`;
-	  cd ../..;
-	  currentDir=`pwd`;
+          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}/%{libname}-gtk2.install;
+          # This topmostDirs hack is needed due to differences in directory
+          # layout between the build system and regular machines
+          topmostDirs=`echo $currentDir | gawk -F '/' '{ print $2"-"$3 }'`;
+          if [ "$topmostDirs" = "var-tmp" ]; then
+            echo $currentDir | gawk -F '/' '{ print "/"$5"/"$6"/"$7"/"$8"/"$9"/"$10"/"$11"/"$12 }' > %{_builddir}/%{buildsubdir}/%{libname}-gtk2.install;
+          else
+            echo $currentDir | gawk -F '/' '{ print "/"$7"/"$8"/"$9"/"$10"/"$11"/"$12"/"$13"/"$14 }' > %{_builddir}/%{buildsubdir}/%{libname}-gtk2.install;
+          fi
         popd
-    elif [ "`basename $l`" = "libswt-atk-gtk-%{swt_version}.so" ]; then
-        echo `basename $l`;
-    elif [ "`basename $l`" = "libswt-awk-gtk-%{swt_version}.so" ]; then
-        echo `basename $l`;
-    elif [ "`basename $l`" = "libswt-gnome-gtk-%{swt_version}.so" ]; then
-        echo `basename $l`;
-    elif [ "`basename $l`" = "libswt-mozilla-gtk-%{swt_version}.so" ]; then
-        echo `basename $l`;
-    elif [ "`basename $l`" = "libswt-pi-gtk-%{swt_version}.so" ]; then
-        echo `basename $l`;
-    else
+    elif [ "`basename $l`" = "libcore_3_1_0.so" ]; then
         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;
+          cd ../../../../..;
+          currentDir=`pwd`;
+          # Add this directory to the files list for eclipse-platform
+          # This topmostDirs hack is needed due to differences in directory
+          # layout between the build system and regular machines
+          topmostDirss=`echo $currentDir | gawk -F '/' '{ print $2"-"$3 }'`;
+          if [ "$topmostDirs" = "var-tmp" ]; then
+            echo $currentDir | gawk -F '/' '{ print "/"$5"/"$6"/"$7"/"$8"/"$9"/"$10"/"$11"/"$12 }' >> %{_builddir}/%{buildsubdir}/%{name}-platform.install;
+          else
+            echo $currentDir | gawk -F '/' '{ print "/"$7"/"$8"/"$9"/"$10"/"$11"/"$12"/"$13"/"$14 }' >> %{_builddir}/%{buildsubdir}/%{name}-platform.install;
+          fi
+        popd
+    elif [ "`basename $l`" = "libupdate.so" ]; then
+        pushd `dirname $l`;
+          cd ../../../../..;
+          currentDir=`pwd`;
+          # Add this directory to the files list for eclipse-platform
+          # This topmostDirs hack is needed due to differences in directory
+          # layout between the build system and regular machines
+          topmostDirss=`echo $currentDir | gawk -F '/' '{ print $2"-"$3 }'`;
+          if [ "$topmostDirs" = "var-tmp" ]; then
+            echo $currentDir | gawk -F '/' '{ print "/"$5"/"$6"/"$7"/"$8"/"$9"/"$10"/"$11"/"$12 }' >> %{_builddir}/%{buildsubdir}/%{name}-platform.install;
+          else
+            echo $currentDir | gawk -F '/' '{ print "/"$7"/"$8"/"$9"/"$10"/"$11"/"$12"/"$13"/"$14 }' >> %{_builddir}/%{buildsubdir}/%{name}-platform.install;
+          fi
         popd
     fi
 done
@@ -1030,6 +1048,7 @@ fi
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/plugins
 %dir %{_datadir}/%{name}/features
+%dir %{_datadir}/%{name}/configuration
 %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_3.*
 %{_datadir}/%{name}/plugins/jdtCompilerAdapter.jar
 %{_datadir}/java/eclipse-ecj.jar
@@ -1209,7 +1228,7 @@ fi
 
 %changelog
 * Tue Jun 21 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.RC3.2
-- Use SWT bundle ID for SWT %files list (determine in %%install) .
+- Use SWT bundle ID for SWT %files list (determine in %%install).
 
 * Mon Jun 20 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.RC3.1
 - Import 3.1RC3.