diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 9c17bf2..f95249e 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -21,7 +21,7 @@ Epoch: 1
 Summary: 	%{pkg_summary}
 Name: 		%{eclipse_name}-cdt
 Version: 	%{majmin}.%{micro}
-Release:	3%{dist}
+Release:	4%{dist}
 License:	Eclipse Public License - v 1.0 (EPL) <http://www.eclipse.org/legal/epl-v10.html>
 Group: 		Text Editors/Integrated Development Environments (IDE)
 URL:		http://www.eclipse.org/cdt
@@ -122,7 +122,7 @@ export JAVA_HOME=%{java_home}
 export PATH=%{java_bin}:/usr/bin:$PATH
 
 # See comments in the script to understand this.
-/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
+/bin/sh -x %{eclipse_lib_base}/buildscripts/copy-platform SDK %{eclipse_base}
 SDK=$(cd SDK >/dev/null && pwd)
 
 # Eclipse may try to write to the home directory.
@@ -136,9 +136,10 @@ popd
 
 # Call eclipse headless to process CDT releng build scripts
 pushd org.eclipse.cdt.releng 
-java -cp  $SDK/startup.jar \
-    -Duser.home=$homedir \
-     org.eclipse.core.launcher.Main \
+java -cp $SDK/startup.jar \
+    -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration                        \
+    -Duser.home=$homedir                        \
+     org.eclipse.core.launcher.Main             \
     -application org.eclipse.ant.core.antRunner \
     -DjavacFailOnError=true \
     -DdontUnzip=true \
@@ -152,9 +153,10 @@ tar -C $SDK --strip-components=1 -zxvf org.eclipse.cdt.releng/results/I.*/org.ec
 
 # Autotools build
 pushd autotools
-java -cp %{eclipse_base}/startup.jar                   \
-     -Duser.home=$homedir                              \
-     org.eclipse.core.launcher.Main                    \
+java -cp $SDK/startup.jar \
+     -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration                        \
+     -Duser.home=$homedir                        \
+     org.eclipse.core.launcher.Main             \
      -application org.eclipse.ant.core.antRunner       \
      -Dtype=feature                                    \
      -Did=com.redhat.eclipse.cdt.autotools.feature         \
@@ -239,6 +241,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Mon Nov 06 2006 Andrew Overholt <overholt@redhat.com> 3.1.1-4
+- Use the new location of copy-platform.
+
 * Thu Oct 19 2006 Ben Konrath <bkonrath@redhat.com> 3.1.1-3
 - Remove work-around for gcc bug # 20198.
 - Do not include notice.html and epl-v10.html because these files are already