diff --git a/eclipse-epic.spec b/eclipse-epic.spec
index a65ed0c..1dbad1e 100644
--- a/eclipse-epic.spec
+++ b/eclipse-epic.spec
@@ -3,7 +3,7 @@
 
 Name:      eclipse-epic
 Version:   0.6.22
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   Perl Eclipse plugin
 Group:     Development/Tools
 License:   CPL
@@ -98,9 +98,26 @@ for g in `find . -name "*.g"`; do
 done
 popd
 
+# prepare pdebuild environment
+/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
+mkdir home
+SDK=$(cd SDK > /dev/null && pwd)
+homedir=$(cd home > /dev/null && pwd)
+
 # build the main feature
-%{eclipse_base}/buildscripts/pdebuild -f org.epic.feature.main \
-  -a "-DjavacTarget=1.4 -DjavacSource=1.4"
+java -cp $SDK/startup.jar \
+  -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
+  org.eclipse.core.launcher.Main \
+  -application org.eclipse.ant.core.antRunner \
+  -Dtype=feature \
+  -Did=org.epic.feature.main \
+  -DbaseLocation=$SDK \
+  -DsourceDirectory=$(pwd) \
+  -DbuildDirectory=$(pwd)/build \
+  -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \
+  -DjavacTarget=1.4 -DjavacSource=1.4 \
+  -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml \
+  -vmargs -Duser.home=$homedir
 
 %install
 rm -rf %{buildroot}
@@ -152,6 +169,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Thu May 01 2008 Mat Booth <fedora@matbooth.co.uk> 0.6.22-5
+- Use long-style PDE build for F-8 branch.
+
 * Tue Apr 29 2008 Mat Booth <fedora@matbooth.co.uk> 0.6.22-4
 - Added missing dependency.
 - Build the source plugin properly to support the "import as projects with