diff --git a/eclipse.spec b/eclipse.spec
index 3189eb9..d26c2a3 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -38,7 +38,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           %{?scl_prefix}eclipse
 Version:        %{eclipse_version}
-Release:        15%{?dist}
+Release:        16%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -125,6 +125,9 @@ Patch26:        %{pkg_name}-feature-plugins-to-category-ius.patch
 # Make workspace selection dialog visible in the task manager of the OS
 Patch27:        eclipse-workspace-chooser.patch
 
+# Require hamcrest when using directly (cannot rely on junit reexporting it)
+Patch28:        eclipse-direct-hamcrest-use.patch
+
 BuildRequires: rsync
 BuildRequires: make, gcc
 BuildRequires: gtk2-devel
@@ -165,7 +168,7 @@ BuildRequires: %{?scl_prefix}lucene-analysis >= 4.10.2
 BuildRequires: junit >= 4.10-5
 BuildRequires: hamcrest >= 0:1.1-11
 BuildRequires: sat4j >= 2.3.5-1
-BuildRequires: %{?scl_prefix}objectweb-asm >= 5.0.2-2
+BuildRequires: objectweb-asm >= 5.0.3-1
 BuildRequires: zip
 BuildRequires: sac >= 1.3-12
 BuildRequires: batik-css >= 1.8-0.17
@@ -173,7 +176,7 @@ BuildRequires: xml-commons-apis >= 1.4.01-12
 BuildRequires: atinject >= 1-6
 BuildRequires: tycho >= 0.22
 BuildRequires: tycho-extras >= 0.22
-BuildRequires: eclipse-ecf-core >= 3.9.1-1
+BuildRequires: eclipse-ecf-core >= 3.9.2-1
 BuildRequires: eclipse-emf-core >= 1:2.10.1-3
 BuildRequires: glassfish-jsp-api >= 2.2.1-4
 BuildRequires: glassfish-jsp >= 2.2.5
@@ -241,7 +244,7 @@ Requires: batik-css >= 1.8-0.17
 Requires: xml-commons-apis >= 1.4.01-12
 Requires: atinject >= 1-6
 Requires: geronimo-annotation >= 1.0-7
-Requires: eclipse-ecf-core >= 3.9.1-1
+Requires: eclipse-ecf-core >= 3.9.2-1
 Requires: eclipse-emf-core >= 1:2.10.1-3
 Requires: glassfish-jsp-api >= 2.2.1-4
 Requires: glassfish-jsp >= 2.2.5
@@ -276,7 +279,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:       %{?scl_prefix}objectweb-asm >= 5.0.2-2
+Requires:       objectweb-asm >= 5.0.3-1
 # For PDE Build wrapper script + creating jars
 Requires:       zip
 Requires:       bash
@@ -340,6 +343,7 @@ tar --strip-components=1 -xf %{SOURCE1}
 %patch25
 %patch26
 %patch27 -p1
+%patch28
 
 #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
@@ -500,6 +504,12 @@ sed -i '/javax\.servlet/ s/3\.1/3\.2/' rt.equinox.bundles/bundles/org.eclipse.eq
 
 sed -i -e 's@Dhelp.lucene.tokenizer=standard@XX:MaxPermSize=384M@g' eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
 
+# Remove generated files not present during bootstrap build
+# org.eclipse.platform.doc.isv, org.eclipse.jdt.doc.isv, org.eclipse.pde.doc.user
+%if %{bootstrap}
+sed -i '18,47d' eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/assembly/assembly.xml
+%endif
+
 %build
 #This is the lowest value where the build succeeds. 512m is not enough.
 export MAVEN_OPTS="-Xmx1000m -XX:MaxPermSize=256m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
@@ -716,8 +726,15 @@ sed -i "s@/usr/share/eclipse@%{libdir}/%{pkg_name}@" $RPM_BUILD_ROOT%{_libdir}/%
 # Tests
 ##############
 
+# Since Tycho 0.22.0 resources get copied into generated eclipse-repository.
+# We place some content in ${project.build.directory} and use that to place
+# it into some other assembled zip.
+# With 0.22.0 it will get placed also into the eclipse-repository zip.
+# Let's just exclude label.properties, and equinoxp2test.properties from
+# the second extraction to avoid the issue entirely.
+
 unzip eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/target/eclipse-junit-tests-bundle.zip -d $RPM_BUILD_ROOT/%{_javadir}/
-unzip $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip -d $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
+unzip $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip -d $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing -x label.properties equinoxp2tests.properties
 cp eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/JUNIT.XSL $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
 cp eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
 cp utils/splitter.xsl $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
@@ -1013,6 +1030,10 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
 
 %changelog
+* Mon Jan 19 2015 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-16
+- Rebuild for new eclipse-ecf/httpcomponents
+- Add patch to explicitly require hamcrest bundle from tests
+
 * Mon Jan 12 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.1-15
 - Require newer batik with fixed obsoletes.