diff --git a/eclipse.spec b/eclipse.spec
index 31bd8e1..f38259d 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -15,7 +15,7 @@ Epoch:                  1
 %global eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
 %global eclipse_micro   0
 %global initialize      1
-%global eb_commit       d30ddf2f70e6795bc9ee080a3d4cbb46143c0371
+%global eb_commit       f2f26a0c09e466a2f7ad870ee99d61fb5c562c6c
 %global eclipse_tag     I20140401-1500
 %global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
 %global installation_loc %{_libdir}/%{pkg_name}
@@ -41,21 +41,10 @@ Epoch:                  1
 # Prevent brp-java-repack-jars from being run.
 %define __jar_repack %{nil}
 
-#Usage
-# _secondary baseArch targetArch
-%define _secondary() \
-_f=`ls | grep -e "%{1}$"`; \
-if [ -d ${_f/%{2}/%{3}/} ]; then \
-    echo "fragment ${_f/%{2}/%{3}/} already exists" \
-else cp -r ${_f} ${_f/%{2}/%{3}/} ; \
-find ${_f/%{2}/%{3}/} -type f -exec sed -i -e "s/%{2}/%{3}/g" {} \\; \
-fi;
-
-
 Summary:        An open, extensible IDE
 Name:           %{?scl_prefix}eclipse
 Version:        %{eclipse_version}
-Release:        0.3.git201404011500%{?dist}
+Release:        0.4.git201404011500%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -387,34 +376,14 @@ popd
 
 %pom_disable_module org.eclipse.ua.tests eclipse.platform.ua
 
-
-#This part generates secondary fragments using primary fragments.
-pushd  eclipse.platform.swt.binaries/bundles
-    %_secondary gtk.linux.x86 x86 arm
-    %_secondary gtk.linux.x86_64 x86_64 aarch64
-popd 
-pushd eclipse.platform.resources/bundles
-    %_secondary linux.x86 x86 arm
-    %_secondary linux.x86 x86 s390
-    %_secondary linux.x86_64 x86_64 s390x
-    %_secondary linux.x86_64 x86_64 aarch64
-popd
-pushd eclipse.platform.team/bundles/org.eclipse.core.net/fragments
-    %_secondary linux.x86 x86 arm
-    %_secondary linux.x86 x86 ppc
-    %_secondary linux.x86_64 x86_64 ppc64
-    %_secondary linux.x86 x86 s390
-    %_secondary linux.x86_64 x86_64 s390x
-    %_secondary linux.x86_64 x86_64 aarch64
-popd
-pushd rt.equinox.framework/bundles
-    %_secondary gtk.linux.x86 x86 arm
-    %_secondary gtk.linux.x86_64 x86_64 aarch64
-popd
-pushd rt.equinox.binaries
-    %_secondary gtk.linux.x86 x86 arm
-    %_secondary gtk.linux.x86_64 x86_64 aarch64
-popd
+# This part generates secondary fragments using primary fragments
+for dir in eclipse.platform.swt.binaries/bundles \
+           eclipse.platform.resources/bundles \
+           eclipse.platform.team/bundles/org.eclipse.core.net/fragments \
+           rt.equinox.framework/bundles rt.equinox.binaries ; do
+  utils/ensure_arch.sh "$dir" x86 arm ppc s390
+  utils/ensure_arch.sh "$dir" x86_64 aarch64 ppc64 s390x
+done
 
 #hack - there should be a patch providing a profile for each arch
 mkdir -p rt.equinox.framework/bundles/org.eclipse.equinox.executable/bin/gtk/linux/%{eclipse_arch}
@@ -1021,6 +990,9 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
 
 %changelog
+* Wed Apr 02 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.4.git201404011500
+- Move secondary-arch fragment generation into e-b.
+
 * Wed Apr 02 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.3.git201404011500
 - Update eclipse-build snapshot
 
diff --git a/sources b/sources
index 8025881..d55fbfb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-c7b7979cea9a7a5995f5405cf1684744  org.eclipse.linuxtools.eclipse-build-d30ddf2f70e6795bc9ee080a3d4cbb46143c0371.tar.bz2
+622a11663780d1f3d97570328b28f57e  org.eclipse.linuxtools.eclipse-build-f2f26a0c09e466a2f7ad870ee99d61fb5c562c6c.tar.bz2
 a4727549f2b739c005cb6b7324691014  R4_platform-aggregator-I20140401-1500.tar.xz