diff --git a/tycho.spec b/tycho.spec
index 014dde1..023bfe8 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -221,11 +221,6 @@ mv fedoraproject-p2-%{fp_p2_git_tag} fedoraproject-p2
 %pom_remove_dep ":org.eclipse.tycho.surefire.junit56" tycho-surefire/tycho-surefire-plugin
 %endif
 
-# Move from org.sonatype.aether to org.eclipse.aether
-find . -name "*.java" | xargs sed -i 's/org.sonatype.aether/org.eclipse.aether/g'
-find . -name "*.java" | xargs sed -i 's/org.eclipse.aether.util.DefaultRepositorySystemSession/org.eclipse.aether.DefaultRepositorySystemSession/g'
-sed -i 's/public int getPriority/public float getPriority/g' tycho-core/src/main/java/org/eclipse/tycho/core/p2/P2RepositoryConnectorFactory.java
-
 # Relax dep on aqute-bndlib
 sed -i -e '/biz.aQute.bndlib/s/5.1.2/3.5.0/' \
   tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF
@@ -236,8 +231,11 @@ sed -i -e 's/ASM9/ASM8/' \
 sed -i -e '/slf4j.api/s/org.slf4j.api/slf4j.api/' \
   tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
 
-# Remove repositories section
-%pom_xpath_remove "pom:repositories" fedoraproject-p2/pom.xml
+# Remove repositories section and pom imports
+%pom_xpath_remove "pom:repositories" fedoraproject-p2
+# Use osgi from local repo
+%pom_xpath_remove "pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='tycho']" fedoraproject-p2/xmvn-p2-installer-plugin
+%pom_xpath_inject  "pom:dependencies/pom:dependency[pom:artifactId='org.eclipse.osgi']" "<version>\${equinox-version}</version>" fedoraproject-p2/xmvn-p2-installer-plugin
 
 # place empty mojo in place
 mkdir -p tycho-maven-plugin/src/main/java/org/fedoraproject
@@ -247,9 +245,7 @@ popd
 
 # Homogenise requirement on OSGi bundle
 %if %{with bootstrap}
-sed -i -e "s/>org.eclipse.platform</>org.eclipse.tycho</" pom.xml tycho-core/pom.xml sisu-equinox/sisu-equinox-embedder/pom.xml
-%else
-sed -i -e "s/>org.eclipse.tycho</>org.eclipse.platform</" fedoraproject-p2/xmvn-p2-installer-plugin/pom.xml
+sed -i -e "s/>org.eclipse.platform</>org.eclipse.tycho</" pom.xml tycho-core/pom.xml sisu-equinox/sisu-equinox-embedder/pom.xml fedoraproject-p2/xmvn-p2-installer-plugin/pom.xml
 %endif
 
 # Target platform does not really apply to RPM builds