diff --git a/eclipse-emf.spec b/eclipse-emf.spec
index 8118805..5cec396 100644
--- a/eclipse-emf.spec
+++ b/eclipse-emf.spec
@@ -8,7 +8,7 @@
 Summary:        Eclipse Modeling Framework (EMF)
 Name:           eclipse-emf
 Version:        %{major}.%{minor}.%{micro}
-Release:        3%{?dist}
+Release:        9%{?dist}
 License:        Eclipse Public License
 Group:          System Environment/Libraries
 URL:            http://www.eclipse.org/emf/
@@ -36,7 +36,7 @@ Patch4:         %{name}-buildAll.patch
 Patch5:         %{name}-examples-dontChangeBundleClasspath.patch
 Patch6:         %{name}-platformjavadocname.patch
 
-BuildRequires:  eclipse-pde
+BuildRequires:  eclipse-sdk
 %if %{gcj_support}
 BuildRequires:    gcc-java >= 4.0.2
 BuildRequires:    java-gcj-compat-devel >= 1.0.64
@@ -156,7 +156,7 @@ mkdir home
 homedir=$(cd home > /dev/null && pwd)
 
 # See comments in the script to understand this.
-/bin/sh -x %{_libdir}/eclipse/buildscripts/copy-platform `pwd`/SDK %{eclipse_base}
+/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
 SDK=$(cd SDK > /dev/null && pwd)
 
 # Build the EMF builder helper jars
@@ -253,9 +253,9 @@ cd org.eclipse.emf.releng.build
 # -DskipFetch=true: don't fetch the sources 
 # -DbaseExists=true: don't download the SDK, we want to use the one in $SDK
 java -cp $SDK/startup.jar \
-    -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration                        \
+    -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
     -Duser.home=$homedir                        \
-     org.eclipse.core.launcher.Main             \
+    org.eclipse.core.launcher.Main              \
     -application org.eclipse.ant.core.antRunner \
     -DjavacFailOnError=true                     \
     -DdontUnzip=true                            \
@@ -519,6 +519,9 @@ fi
 %doc %{_datadir}/java/emf/readme_standalone.html
 
 %changelog
+* Wed Dec 06 2006 Andrew Overholt <overholt@redhat.com> 2.2.1-9
+- Bump release and build for rawhide.
+
 * Mon Nov 06 2006 Andrew Overholt <overholt@redhat.com> 2.2.1-3
 - Use copy-platform in %%{_libdir}.
 - Add Requires(post,postun) for sub-packages using rebuild-gcj-db.