diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch
index d242477..1aa61ba 100644
--- a/eclipse-no-source-for-dependencies.patch
+++ b/eclipse-no-source-for-dependencies.patch
@@ -48,7 +48,7 @@
              <configuration>
                <excludes>
                    <plugin id="org.eclipse.pde"/>
-+		  <plugin id="org.objectweb.asm"/>
++		  <plugin id="org.objectweb.asm.all"/>
                    <plugin id="org.eclipse.pde.doc.user"/>
                </excludes>
              </configuration>
diff --git a/eclipse-objectweb-asm-all.patch b/eclipse-objectweb-asm-all.patch
new file mode 100644
index 0000000..51d1f4b
--- /dev/null
+++ b/eclipse-objectweb-asm-all.patch
@@ -0,0 +1,48 @@
+diff -ur eclipse.pde/org.eclipse.pde-feature/feature.xml eclipse.pde/org.eclipse.pde-feature/feature.xml
+--- eclipse.pde/org.eclipse.pde-feature/feature.xml	2014-04-01 22:00:14.000000000 +0100
++++ eclipse.pde/org.eclipse.pde-feature/feature.xml	2014-04-02 16:09:47.877543514 +0100
+@@ -82,7 +82,7 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.objectweb.asm"
++         id="org.objectweb.asm.all"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+diff -ur eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/META-INF/MANIFEST.MF eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/META-INF/MANIFEST.MF
+--- eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/META-INF/MANIFEST.MF	2014-04-01 22:03:06.000000000 +0100
++++ eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/META-INF/MANIFEST.MF	2014-04-02 16:08:09.390359775 +0100
+@@ -14,7 +14,7 @@
+  org.eclipse.text;bundle-version="[3.4.0,4.0.0)",
+  org.eclipse.core.filebuffers;bundle-version="[3.4.0,4.0.0)",
+  org.eclipse.ant.core;bundle-version="[3.1.300,4.0.0)",
+- org.objectweb.asm;bundle-version="[5.0.1,6.0.0)",
++ org.objectweb.asm.all;bundle-version="[5.0.1,6.0.0)",
+  org.eclipse.team.core;bundle-version="[3.4.0,4.0.0)",
+  org.eclipse.core.filesystem;bundle-version="[1.2.0,2.0.0)",
+  org.eclipse.equinox.frameworkadmin;bundle-version="[2.0.0,3.0.0)",
+diff -ur eclipse.pde.ui/apitools/org.eclipse.pde.api.tools.generator/META-INF/MANIFEST.MF eclipse.pde.ui/apitools/org.eclipse.pde.api.tools.generator/META-INF/MANIFEST.MF
+--- eclipse.pde.ui/apitools/org.eclipse.pde.api.tools.generator/META-INF/MANIFEST.MF	2014-04-01 22:03:05.000000000 +0100
++++ eclipse.pde.ui/apitools/org.eclipse.pde.api.tools.generator/META-INF/MANIFEST.MF	2014-04-02 16:08:09.390359775 +0100
+@@ -5,7 +5,7 @@
+ Bundle-Version: 1.0.200.qualifier
+ Bundle-Vendor: %providerName
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+-Require-Bundle: org.objectweb.asm;bundle-version="[5.0.0,6.0.0)",
++Require-Bundle: org.objectweb.asm.all;bundle-version="[5.0.0,6.0.0)",
+  org.eclipse.pde.api.tools;bundle-version="[1.0.600,2.0.0)",
+  org.eclipse.jdt.core;bundle-version="[3.8.1,4.0.0)",
+  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)"
+diff -ur eclipse.pde.ui/apitools/org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF eclipse.pde.ui/apitools/org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF
+--- eclipse.pde.ui/apitools/org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF	2014-04-01 22:03:05.000000000 +0100
++++ eclipse.pde.ui/apitools/org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF	2014-04-02 16:08:09.390359775 +0100
+@@ -22,7 +22,7 @@
+  org.eclipse.jdt.core.tests.builder;bundle-version="[3.8.0,4.0.0)",
+  org.eclipse.jdt.core.tests.compiler;bundle-version="[3.8.0,4.0.0)",
+  org.eclipse.ant.core,
+- org.objectweb.asm;bundle-version="[5.0.1,6.0.0)",
++ org.objectweb.asm.all;bundle-version="[5.0.1,6.0.0)",
+  org.eclipse.jface;bundle-version="3.8.0"
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Export-Package: org.eclipse.pde.api.tools.anttasks.tests,
diff --git a/eclipse.spec b/eclipse.spec
index f38259d..5786bb0 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -44,7 +44,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           %{?scl_prefix}eclipse
 Version:        %{eclipse_version}
-Release:        0.4.git201404011500%{?dist}
+Release:        0.5.git201404011500%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -118,6 +118,9 @@ Patch22:        %{pkg_name}-mockito.patch
 
 Patch23:        %{pkg_name}-policy-comparators.patch
 
+# org.objectweb.asm -> org.objectweb.asm.all
+Patch24:        %{pkg_name}-objectweb-asm-all.patch
+
 BuildRequires: ant >= 1.8.3
 BuildRequires: rsync
 BuildRequires: make, gcc
@@ -328,6 +331,7 @@ popd
 %patch21
 %patch22
 %patch23
+%patch24
 
 #Disable as many things as possible to make the build faster. We care only for Eclipse.
 %pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
@@ -442,10 +446,6 @@ pushd eclipse.platform.swt.binaries/bundles/
 popd
 
 sed -i -e 's@Dhelp.lucene.tokenizer=standard@XX:MaxPermSize=384M@g' eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
-sed -i -e 's@org.objectweb.asm@org.objectweb.asm.all@' \
-  eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/META-INF/MANIFEST.MF \
-  eclipse.pde.ui/apitools/org.eclipse.pde.api.tools.generator/META-INF/MANIFEST.MF \
-  eclipse.pde.ui/apitools/org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF
 
 %build
 %{?scl:%scl_maven_opts}
@@ -485,10 +485,9 @@ pushd plugins
  f=`ls | grep -e "^javax.servlet-api_"`
  rm -f $f
  ln -s %{_javadir}/glassfish-servlet-api.jar $f
- rm -f asm-all.jar
 popd
 
-#in jdt and pde
+#in jdt
 pushd dropins/jdt/plugins
  f=`ls | grep -e "^org.hamcrest.core_"`
  rm -f $f 
@@ -497,11 +496,6 @@ pushd dropins/jdt/plugins
  rm -f $f
  ln -s %{_javadir}/junit.jar $f
 popd
-pushd dropins/sdk/plugins
- f=`ls | grep -e "^org.objectweb.asm_"`
- rm $f 
- ln -s %{_javadir}/objectweb-asm/asm-all.jar $f
-popd
 
 #clean up
 rm -rf configuration/org.eclipse.core.runtime
@@ -768,6 +762,7 @@ fi
 %{_libdir}/%{pkg_name}/features/org.eclipse.emf.common_*
 %{_libdir}/%{pkg_name}/features/org.eclipse.emf.ecore_*
 %{_libdir}/%{pkg_name}/features/org.eclipse.rcp.configuration_*
+%{_libdir}/%{pkg_name}/plugins/asm*
 %{_libdir}/%{pkg_name}/plugins/com.ibm.icu_*
 %{_libdir}/%{pkg_name}/plugins/com.jcraft.jsch_*
 %{_libdir}/%{pkg_name}/plugins/javax.servlet-api_*
@@ -990,6 +985,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.5.git201404011500
+- Add patch for org.ojectweb.asm -> org.ojectweb.asm.all
+
 * 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.