diff --git a/.gitignore b/.gitignore
index a0c9058..ac2ef65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
 /javapackages-0.12.3.tar.xz
 /javapackages-0.12.4.tar.xz
 /javapackages-0.12.5.tar.xz
+/javapackages-0.12.6.tar.xz
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 4193200..04820d6 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,5 +1,5 @@
 Name:           javapackages-tools
-Version:        0.12.5
+Version:        0.12.6
 Release:        1%{?dist}
 Summary:        Macros and scripts for Java packaging support
 
@@ -85,23 +85,6 @@ install -p -m 755 scripts/mvn-* $RPM_BUILD_ROOT%{_bindir}
 rm -f $RPM_BUILD_ROOT%{_bindir}/mvn-{local,rpmbuild}
 %endif
 
-# Ugly as hell, but Eclipse relocated various artifacts under
-# their own groupId. We need to fix this globally.
-# FIXME: this should be moved to respective packages
-%add_to_maven_depmap org.eclipse.jetty.orbit javax.servlet any JPP tomcat-servlet-3.0-api
-%add_to_maven_depmap org.eclipse.jetty.orbit javax.security.auth.message any JPP geronimo-jaspic-spec
-%add_to_maven_depmap org.eclipse.jetty.orbit javax.mail.glassfish any JPP/javamail mail
-%add_to_maven_depmap org.eclipse.jetty.orbit javax.transaction any JPP geronimo-jta
-%add_to_maven_depmap org.eclipse.jetty.orbit javax.annotation any JPP geronimo-annotation
-%add_to_maven_depmap org.eclipse.jetty.orbit org.objectweb.asm any JPP/objectweb-asm asm-all
-%add_to_maven_depmap org.eclipse.jetty.orbit javax.servlet.jsp any JPP tomcat-jsp-api
-%add_to_maven_depmap org.eclipse.jetty.orbit org.apache.jasper.glassfish any JPP glassfish-jsp
-%add_to_maven_depmap org.eclipse.jetty.orbit javax.servlet.jsp.jstl any JPP taglibs-core
-%add_to_maven_depmap org.eclipse.jetty.orbit org.apache.taglibs.standard.glassfish any JPP taglibs-standard
-%add_to_maven_depmap org.eclipse.jetty.orbit javax.el any JPP tomcat-el-2.2-api
-%add_to_maven_depmap org.eclipse.jetty.orbit com.sun.el any JPP tomcat-el-2.2-api
-%add_to_maven_depmap org.eclipse.jetty.orbit org.eclipse.jdt.core any JPP/eclipse jdt.core
-
 
 %files
 %doc LICENSE
@@ -123,6 +106,11 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/mvn-{local,rpmbuild}
 
 
 %changelog
+* Mon Mar  4 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.12.6-1
+- Update to upstream version 0.12.6
+- Resolves: rhbz#917618 (remove jetty orbit provides)
+- Resolves: rhbz#917647 (system.bundle into autogenerated deps)
+
 * Fri Mar  1 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0.12.5-1
 - Update to upstream version 0.12.5
 - Resolves problems with compat package provides and automatic requires
diff --git a/sources b/sources
index 8cf8c2d..a2c2d95 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e98c9fe09b2b14dad0a70d2095ee428e  javapackages-0.12.5.tar.xz
+d427676361b553a08bcac3e78528667a  javapackages-0.12.6.tar.xz