diff --git a/eclipse-change-build-packagings.patch b/eclipse-change-build-packagings.patch
index 5ad2457..5481a05 100644
--- a/eclipse-change-build-packagings.patch
+++ b/eclipse-change-build-packagings.patch
@@ -31,8 +31,8 @@
 --- eclipse.platform.releng.tychoeclipsebuilder/pom.xml.orig	2014-03-12 10:25:46.000000000 +0000
 +++ eclipse.platform.releng.tychoeclipsebuilder/pom.xml	2014-03-12 12:17:01.625708314 +0000
 @@ -34,5 +34,6 @@
+         <module>platform.sdk</module>
          <module>sdk</module>
-         <module>equinox.starterkit.product</module>
          <module>eclipse-junit-tests</module>
 +        <module>jdtpde</module>
      </modules>
@@ -66,3 +66,34 @@
 +  <version>4.4.0-SNAPSHOT</version>
    <packaging>eclipse-repository</packaging>
  </project>
+--- eclipse.platform.releng/features/org.eclipse.sdk/feature.xml.orig	2014-04-01 15:46:22.356772259 +0100
++++ eclipse.platform.releng/features/org.eclipse.sdk/feature.xml	2014-04-01 15:46:37.124510818 +0100
+@@ -19,10 +19,10 @@
+       %license
+    </license>
+ 
+-   <requires>
++   <!--requires>
+       <import feature="org.eclipse.emf.common.source" version="2.7.0" match="compatible"/>
+       <import feature="org.eclipse.emf.ecore.source" version="2.7.0" match="compatible"/>
+-   </requires>
++   </requires-->
+    
+    <!--
+       <import feature="org.eclipse.ecf.core.source.feature" version="1.1.0" match="compatible"/>
+--- eclipse.jdt/org.eclipse.jdt-feature/feature.xml.orig	2014-04-01 16:47:57.604505297 +0100
++++ eclipse.jdt/org.eclipse.jdt-feature/feature.xml	2014-04-01 16:48:09.628288129 +0100
+@@ -85,13 +85,6 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.eclipse.jdt.annotation"
+-         download-size="0"
+-         install-size="0"
+-         version="2.0.0.qualifier"
+-         unpack="false"/>
+-
+-   <plugin
+          id="org.eclipse.jdt.core.manipulation"
+          download-size="0"
+          install-size="0"
diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch
index 21eb2d0..ae328fc 100644
--- a/eclipse-secondary-arches.patch
+++ b/eclipse-secondary-arches.patch
@@ -263,19 +263,6 @@ index 7dd0536..66d79ee 100644
      <module>bundles/org.eclipse.swt.gtk.linux.x86</module>
      <module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
      <module>bundles/org.eclipse.swt.gtk.solaris.sparc</module>
-diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
-index 689616e..4caf0a9 100644
---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	
-+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	
-@@ -411,7 +411,7 @@ esac
- 
- 
- # For 64-bit CPUs, we have a switch
--if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparc64'  -o ${MODEL} = 's390x' ]; then
-+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparc64'  -o ${MODEL} = 's390x' -o ${MODEL} = 'aarch64' ]; then
- 	SWT_PTR_CFLAGS=-DJNI64
- 	if [ -d /lib64 ]; then
- 		XLIB64=-L/usr/X11R6/lib64
 diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml b/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
 index f5fb504..1187e84 100644
 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
diff --git a/eclipse-test-support.patch b/eclipse-test-support.patch
index 0989b0e..64098d5 100644
--- a/eclipse-test-support.patch
+++ b/eclipse-test-support.patch
@@ -153,187 +153,178 @@
 - else
 -	$vmcmd -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch  -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger
 - fi
---- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig	2013-05-01 13:30:04.000000000 +0200
-+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml	2013-05-03 14:44:17.278068172 +0200
-@@ -175,99 +175,15 @@
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig	2014-04-01 15:02:34.500445944 +0100
++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml	2014-04-01 15:16:01.556714647 +0100
+@@ -200,99 +200,14 @@
  
-     <!--use an stable version of the director so that instability in the current build doesn't cause all the tests to fail -->
-     <target name="setupPlatform">
--        <echo message="os.arch ${os.arch}" />
--        <loadproperties srcfile="equinoxp2tests.properties" />
--        <condition
--            property="platformArchive"
--            value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux}">
--            <and>
--                <os family="unix" />
--                <not>
--                    <or>
--                        <or>
--                            <os arch="x86_64" />
--                            <os arch="amd64" />
--                        </or>
--                        <os family="mac" />
--                    </or>
--                </not>
--            </and>
--        </condition>
--        <condition
--            property="platformArchive"
--            value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64}">
--            <and>
--                <os family="mac" />
--                <os family="unix" />
--                <or>
--                    <os arch="x86_64" />
--                    <os arch="amd64" />
--                </or>
--            </and>
--        </condition>
--        <condition
--            property="platformArchive"
--            value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx}">
--            <and>
--                <os family="mac" />
--                <os family="unix" />
--                <!-- should not need, as long as x86_64 rules (above) comes first
--                <os arch="i386" />
--                -->
--            </and>
--        </condition>
--        <condition
--            property="platformArchive"
--            value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32}">
--            <and>
--                <os family="windows" />
--                <os arch="x86" />
--            </and>
--        </condition>
--        <condition
--            property="platformArchive"
--            value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64}">
--            <and>
--                <os family="windows" />
--                <or>
--                    <os arch="x86_64" />
--                    <os arch="amd64" />
--                </or>
--            </and>
--        </condition>
--        <condition
--            property="platformArchive"
--            value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64}">
--            <and>
--                <os family="unix" />
--                <or>
--                    <os arch="x86_64" />
--                    <os arch="amd64" />
--                </or>
--            </and>
--        </condition>
+   <!--use an stable version of the director so that instability in the current build doesn't cause all the tests to fail -->
+   <target name="setupPlatform">
+-    <echo message="os.arch ${os.arch}" />
+     <loadproperties srcfile="equinoxp2tests.properties" />
+-    <condition
+-      property="platformArchive"
+-      value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux}">
+-      <and>
+-        <os family="unix" />
+-        <not>
+-          <or>
+-            <or>
+-              <os arch="x86_64" />
+-              <os arch="amd64" />
+-            </or>
+-            <os family="mac" />
+-          </or>
+-        </not>
+-      </and>
+-    </condition>
+-    <condition
+-      property="platformArchive"
+-      value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64}">
+-      <and>
+-        <os family="mac" />
+-        <os family="unix" />
+-        <or>
+-          <os arch="x86_64" />
+-          <os arch="amd64" />
+-        </or>
+-      </and>
+-    </condition>
+-    <condition
+-      property="platformArchive"
+-      value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx}">
+-      <and>
+-        <os family="mac" />
+-        <os family="unix" />
+-        <!-- should not need, as long as x86_64 rules (above) comes first
+-             <os arch="i386" />
+-        -->
+-      </and>
+-    </condition>
+-    <condition
+-      property="platformArchive"
+-      value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32}">
+-      <and>
+-        <os family="windows" />
+-        <os arch="x86" />
+-      </and>
+-    </condition>
+-    <condition
+-      property="platformArchive"
+-      value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64}">
+-      <and>
+-        <os family="windows" />
+-        <or>
+-          <os arch="x86_64" />
+-          <os arch="amd64" />
+-        </or>
+-      </and>
+-    </condition>
+-    <condition
+-      property="platformArchive"
+-      value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64}">
+-      <and>
+-        <os family="unix" />
+-        <or>
+-          <os arch="x86_64" />
+-          <os arch="amd64" />
+-        </or>
+-      </and>
++    <property name="platformArchive" value="${runtimeArchive}" />
++    <condition property="platformTarget" value="platform-zip">
++      <contains string="${platformArchive}" substring=".zip" />
+     </condition>
 -
--        <fail
--            unless="platformArchive"
--            message="platformArchive is not defined. Check that condidtions cover os arch ${os.arch}. May be VM dependent.)" />
+-    <fail
+-      unless="platformArchive"
+-      message="platformArchive is not defined. Check that conditions cover os arch ${os.arch}. May be VM dependent.)" />
 -
--        <condition
--            property="platformTarget"
--            value="platform-zip">
--            <contains
--                string="${platformArchive}"
--                substring=".zip" />
--        </condition>
--        <condition
--            property="platformTarget"
--            value="platform-tar.gz">
--            <contains
--                string="${platformArchive}"
--                substring=".tar.gz" />
--        </condition>
--        <fail
--            unless="platformTarget"
--            message="platformTarget is not defined. Check that platformArchive variable and value is defined correctly, such as in equinoxp2tests.properties in the appropriate testConfig" />
-+ 	        <loadproperties srcfile="equinoxp2tests.properties" />
-+    	    	    	<property name="platformArchive" value="${runtimeArchive}" />
-+    	    	    	        
-+    	    	    	<condition property="platformTarget" value="platform-zip">
-+    	    	    	      <contains string="${platformArchive}" substring=".zip" />
-+    	    	    	</condition>
-+    	   	    	<condition property="platformTarget" value="platform-tar.gz">
-+    	    	    	       <contains string="${platformArchive}" substring=".tar.gz" />
-+    	    	    	</condition>
-         <echo message="platformTarget ${platformTarget} platformArchive ${platformArchive}" />
-         <antcall target="${platformTarget}" />
-     </target>
-@@ -295,7 +211,7 @@
-         <exec
-             dir="${platformLocation}"
-             executable="tar">
--            <arg line="-xzf ${platformArchive}" />
-+            <arg line="-xzf ../${platformArchive}" />
-         </exec>
-     </target>
+-    <condition
+-      property="platformTarget"
+-      value="platform-zip">
+-      <contains
+-        string="${platformArchive}"
+-        substring=".zip" />
+-    </condition>
+-    <condition
+-      property="platformTarget"
+-      value="platform-tar.gz">
+-      <contains
+-        string="${platformArchive}"
+-        substring=".tar.gz" />
++    <condition property="platformTarget" value="platform-tar.gz">
++      <contains string="${platformArchive}" substring=".tar.gz" />
+     </condition>
+-    <fail
+-      unless="platformTarget"
+-      message="platformTarget is not defined. Check that platformArchive variable and value is defined correctly, such as in equinoxp2tests.properties in the appropriate testConfig" />
+     <echo message="platformTarget ${platformTarget} platformArchive ${platformArchive}" />
+     <antcall target="${platformTarget}" />
+   </target>
+@@ -320,7 +235,7 @@
+     <exec
+       dir="${platformLocation}"
+       executable="tar">
+-      <arg line="-xzf ${platformArchive}" />
++      <arg line="-xzf ../${platformArchive}" />
+     </exec>
+   </target>
  
-@@ -842,6 +758,18 @@
-                     arg2="" />
-             </not>
-         </condition>
-+    	        
-+    	        <!-- swt needs this property to run tests -->
-+    	        <dirset id="test.plugin.folder" dir="${eclipse-home}/plugins/">
-+    	            <include name="${testPlugin}_*" />
-+    	        </dirset>
-+    	        <property name="testPluginFolder" refid="test.plugin.folder" />
-+    	        <echo>trying to find ${testPluginFolder}</echo>
-+    	        <condition property="org.eclipse.swt.tests" value="${testPluginFolder}">
-+    	                <equals arg1="${testPlugin}" arg2="org.eclipse.swt.tests"/>
-+    	        </condition>
-+    	  
-+    	
-         <antcall target="runSuite" />
-         <antcall target="genResults" />
-     </target>
-@@ -1420,7 +1348,17 @@
-                 name="message"
-                 value="end longRunningTests" />
-         </antcall>
--
-+    	<!-- Copy over the XML to generate a top-level report for all of the tests -->
-+    	    	<mkdir dir="${results}/origXml" />
-+    			<xslt style="${repoLocation}/splitter.xsl" basedir="${results}/xml" includes="*.xml" destdir="${results}/origXml"/>
+@@ -867,6 +782,17 @@
+           arg2="" />
+       </not>
+     </condition>
++
++    <!-- swt needs this property to run tests -->
++    <dirset id="test.plugin.folder" dir="${eclipse-home}/plugins/">
++      <include name="${testPlugin}_*" />
++    </dirset>
++    <property name="testPluginFolder" refid="test.plugin.folder" />
++    <echo>trying to find ${testPluginFolder}</echo>
++    <condition property="org.eclipse.swt.tests" value="${testPluginFolder}">
++      <equals arg1="${testPlugin}" arg2="org.eclipse.swt.tests"/>
++    </condition>
 +
-+    	    	<!-- Aggregate XML report files -->
-+    	    	<junitreport todir="${results}/xml" tofile="org.eclipse.sdk.tests.xml">
-+    	    		<fileset dir="${results}/origXml" includes="*.xml" />
-+    	    	</junitreport>
-+    	    	
-+    	    	<!-- Generate top-level HTML report -->
-+    	    	<xslt style="${repoLocation}/JUNIT.XSL" basedir="${results}/xml" includes="org.eclipse.sdk.tests.xml" destdir="${results}/html" />
-     </target>
+     <antcall target="runSuite" />
+     <antcall target="genResults" />
+   </target>
+@@ -1411,6 +1337,15 @@
+         value="end longRunningTests" />
+     </antcall>
+ 
++    <!-- Copy over the XML to generate a top-level report for all of the tests -->
++    <mkdir dir="${results}/origXml" />
++    <xslt style="${repoLocation}/splitter.xsl" basedir="${results}/xml" includes="*.xml" destdir="${results}/origXml"/>
++    <!-- Aggregate XML report files -->
++    <junitreport todir="${results}/xml" tofile="org.eclipse.sdk.tests.xml">
++      <fileset dir="${results}/origXml" includes="*.xml" />
++    </junitreport>
++    <!-- Generate top-level HTML report -->
++    <xslt style="${repoLocation}/JUNIT.XSL" basedir="${results}/xml" includes="org.eclipse.sdk.tests.xml" destdir="${results}/html" />
+   </target>
  
-     <!-- 
-@@ -1461,7 +1399,7 @@
-         <antcall target="e4CssSwt" />
-         <antcall target="e4UI" />
-         <antcall target="equinoxds" />
--        <antcall target="equinoxp2discovery" />
-+        <!--antcall target="equinoxp2discovery" /-->
-         <antcall target="bidi" />
-         <antcall target="ltkuirefactoringtests" />
-         <antcall target="ltkcorerefactoringtests" />
-@@ -1475,7 +1413,6 @@
-         <antcall target="osgi" />
-         <antcall target="coreresources" />
-         <antcall target="equinoxp2" />
--        <antcall target="teamcvs" />
-         <antcall target="jface" />
-         <antcall target="ui" />
-         <antcall target="uiperformance" />
-@@ -1558,7 +1495,7 @@
-         <property
-             name="message"
-             value="no message given by caller" />
--        <markTime msg="${message}" />
-+        <!--markTime msg="${message}" /-->
-     </target>
+   <!--
+@@ -1453,7 +1388,6 @@
+     <antcall target="e4CssSwt" />
+     <antcall target="e4UI" />
+     <antcall target="equinoxds" />
+-    <antcall target="equinoxp2discovery" />
+     <antcall target="bidi" />
+     <antcall target="ltkuirefactoringtests" />
+     <antcall target="ltkcorerefactoringtests" />
+@@ -1467,7 +1401,6 @@
+     <antcall target="osgi" />
+     <antcall target="coreresources" />
+     <antcall target="equinoxp2" />
+-    <antcall target="teamcvs" />
+     <antcall target="jface" />
+     <antcall target="ui" />
+     <antcall target="uiperformance" />
+@@ -1550,7 +1483,7 @@
+     <property
+       name="message"
+       value="no message given by caller" />
+-    <markTime msg="${message}" />
++    <!--markTime msg="${message}" /-->
+   </target>
  
- </project>
+   <!--
diff --git a/eclipse.spec b/eclipse.spec
index a9485dc..c480b44 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -16,7 +16,7 @@ Epoch:                  1
 %global eclipse_micro   0
 %global initialize      1
 %global eb_commit       10b193b0f225b307353a892050993d0ebb1da6f9
-%global eclipse_tag     S4_4_0_M6
+%global eclipse_tag     I20140401-1500
 %global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
 %global installation_loc %{_libdir}/%{pkg_name}
 
@@ -55,7 +55,7 @@ fi;
 Summary:        An open, extensible IDE
 Name:           %{?scl_prefix}eclipse
 Version:        %{eclipse_version}
-Release:        0.1.M6%{?dist}
+Release:        0.2%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -143,7 +143,6 @@ BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libGLU-devel
 BuildRequires: cairo >= 1.0
 BuildRequires: unzip
-BuildRequires: coreutils
 BuildRequires: desktop-file-utils
 BuildRequires: java-devel >= 1:1.7.0
 BuildRequires: libXt-devel
@@ -171,7 +170,7 @@ BuildRequires: lucene-analysis >= 4.7.0-7
 BuildRequires: junit >= 4.10-5
 BuildRequires: hamcrest >= 0:1.1-11
 BuildRequires: %{?scl_prefix}sat4j >= 2.3.5-1
-BuildRequires: objectweb-asm3 >= 3.3.1-1
+BuildRequires: objectweb-asm >= 5.0.1-1
 BuildRequires: zip
 BuildRequires: sac >= 1.3-12
 BuildRequires: batik  >= 1.8
@@ -289,7 +288,7 @@ Group:          Development/Tools
 Provides:       %{name} = %{epoch}:%{eclipse_version}-%{release}
 Requires:       %{name}-platform = %{epoch}:%{eclipse_version}-%{release}
 Requires:       %{name}-jdt = %{epoch}:%{eclipse_version}-%{release}
-Requires:       objectweb-asm3 >= 3.3.1-1
+Requires:       objectweb-asm >= 5.0.1-1
 # For PDE Build wrapper script + creating jars
 Requires:       zip
 Requires:       bash
@@ -346,8 +345,10 @@ popd
 %pom_disable_module rcp eclipse.platform.releng.tychoeclipsebuilder
 %pom_disable_module rcp.sdk eclipse.platform.releng.tychoeclipsebuilder
 %pom_disable_module sdk eclipse.platform.releng.tychoeclipsebuilder
+%pom_disable_module equinox-sdk eclipse.platform.releng.tychoeclipsebuilder
 %pom_disable_module equinox.starterkit.product eclipse.platform.releng.tychoeclipsebuilder
 %pom_disable_module eclipse.platform.repository
+%pom_disable_module org.eclipse.jdt.annotation eclipse.jdt.core
 
 %pom_disable_module bundles/org.eclipse.equinox.region.tests rt.equinox.bundles
 %pom_disable_module bundles/org.eclipse.equinox.weaving.aspectj rt.equinox.bundles
@@ -364,7 +365,7 @@ popd
 %pom_disable_module bundles/org.eclipse.equinox.weaving.caching rt.equinox.bundles
 %pom_disable_module bundles/org.eclipse.equinox.weaving.hook rt.equinox.bundles
 %pom_disable_module features/org.eclipse.equinox.compendium.sdk rt.equinox.bundles
-%pom_disable_module features/org.eclipse.equinox.core.sdk rt.equinox.framework
+%pom_disable_module features/org.eclipse.equinox.core.sdk rt.equinox.bundles
 %pom_disable_module features/org.eclipse.osgi.compatibility.plugins.feature rt.equinox.framework
 %pom_disable_module bundles/org.eclipse.osgi.compatibility.plugins rt.equinox.framework
 %pom_disable_module features/org.eclipse.equinox.p2.sdk rt.equinox.p2
@@ -472,6 +473,10 @@ 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}
@@ -489,7 +494,9 @@ xmvn -o clean verify \
    -Dtargets=install
 
 #symlink necessary plugins (that are provided by other packages)
-dependencies/./replace_platform_plugins_with_symlinks.sh \
+sed -i -e '27i _symlink org.objectweb.asm.all_ objectweb-asm/asm-all.jar' \
+  dependencies/replace_platform_plugins_with_symlinks.sh
+dependencies/replace_platform_plugins_with_symlinks.sh \
     eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/eclipse %{_javadir}
 #ant again
 ./dependencies/./fake_ant_dependency.sh \
@@ -511,6 +518,7 @@ 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
@@ -518,14 +526,14 @@ pushd dropins/jdt/plugins
  f=`ls | grep -e "^org.hamcrest.core_"`
  rm -f $f 
  ln -s %{_javadir}/hamcrest/core.jar $f
-
- rm -rf org.junit_4*
- ln -s /usr/share/java/junit.jar
+ f=`ls | grep -e "^org.junit_4"`
+ 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-asm3/asm-all.jar $f
+ ln -s %{_javadir}/objectweb-asm/asm-all.jar $f
 popd
 
 #clean up
@@ -1015,7 +1023,11 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
 
 %changelog
-* Mon Mar 24 2014 Mat Booth <fedora@matbooth.co.uk> - 1:4.4.0-0.1.M6
+* Tue Apr 01 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.2
+- Update to latest I-build of Luna 4.4.0
+- Require objectweb-asm >= 5.0.1
+
+* Mon Mar 24 2014 Mat Booth <fedora@matbooth.co.uk> - 1:4.4.0-0.1
 - Update to M6 pre-release of Luna 4.4.0
 - Bootstrap build
 - Drop upstreamed patches: do-not-run-as-root, bug-408505,
diff --git a/get-eclipse.sh b/get-eclipse.sh
index c84bba9..0ada48d 100755
--- a/get-eclipse.sh
+++ b/get-eclipse.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
-TAG=S4_4_0_M6
+TAG=I20140401-1500
 
 rm -rf R4_platform-aggregator-$TAG
 rm -rf R4_platform-aggregator-$TAG.tar.xz
diff --git a/sources b/sources
index 5cbb44d..a515f3d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 ffe1d5aacf43506dae81a422d4f88256  org.eclipse.linuxtools.eclipse-build-10b193b0f225b307353a892050993d0ebb1da6f9.tar.bz2
-abb0ead27b51c00e9b5cdc153177a427  R4_platform-aggregator-S4_4_0_M6.tar.xz
+a4727549f2b739c005cb6b7324691014  R4_platform-aggregator-I20140401-1500.tar.xz