diff --git a/0001-Remove-javadoc-execution.patch b/0001-Remove-javadoc-execution.patch
deleted file mode 100644
index c2c520c..0000000
--- a/0001-Remove-javadoc-execution.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From c582282bd0742ea950c644d2954e5e65980fc4d5 Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Tue, 24 Jan 2012 10:33:17 +0100
-Subject: [PATCH 1/8] Remove javadoc execution
-
-We generate javadoc as a separate step
----
- jetty-aggregate/jetty-all/pom.xml |   13 -------------
- jetty-distribution/pom.xml        |    7 -------
- 2 files changed, 0 insertions(+), 20 deletions(-)
-
-diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml
-index e6f83fe..97461a8 100644
---- a/jetty-aggregate/jetty-all/pom.xml
-+++ b/jetty-aggregate/jetty-all/pom.xml
-@@ -76,19 +76,6 @@
-           </execution>
-         </executions>
-       </plugin>
--      <plugin>
--        <groupId>org.apache.maven.plugins</groupId>
--        <artifactId>maven-javadoc-plugin</artifactId>
--        <executions>
--          <execution>
--            <id>javadoc-jar</id>
--            <phase>compile</phase>
--            <goals>
--              <goal>jar</goal>
--            </goals>
--          </execution>
--        </executions>
--      </plugin>
-     </plugins>
-   </build>
- 
-diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
-index 32ac454..aff91ff 100644
---- a/jetty-distribution/pom.xml
-+++ b/jetty-distribution/pom.xml
-@@ -398,13 +398,6 @@
-       <artifactId>jetty-overlay-deployer</artifactId>
-       <version>${project.version}</version>
-     </dependency>
--    <dependency>
--      <groupId>org.eclipse.jetty.aggregate</groupId>
--      <artifactId>jetty-all</artifactId>
--      <classifier>javadoc</classifier>
--      <type>jar</type>
--      <version>${project.version}</version>
--    </dependency>
-   </dependencies>
-   <profiles>
-     <profile>
--- 
-1.7.7.6
-
diff --git a/0002-Disable-test-artifacts.patch b/0002-Disable-test-artifacts.patch
deleted file mode 100644
index ef57be4..0000000
--- a/0002-Disable-test-artifacts.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 032c4ef3747063337f4dc7eccf9085c1aef55ecc Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Tue, 24 Jan 2012 11:09:27 +0100
-Subject: [PATCH 2/8] Disable test artifacts
-
-- they need more dependencies then we have time for right now :-)
----
- jetty-osgi/pom.xml |    1 -
- pom.xml            |    5 -----
- 2 files changed, 0 insertions(+), 6 deletions(-)
-
-diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml
-index b1060c6..44cb42c 100644
---- a/jetty-osgi/pom.xml
-+++ b/jetty-osgi/pom.xml
-@@ -23,7 +23,6 @@
-     <module>jetty-osgi-boot-jsp</module>
-     <module>jetty-osgi-boot-warurl</module>
-     <module>jetty-osgi-httpservice</module>
--    <module>test-jetty-osgi</module>
-   </modules>
-   <build>
-     <resources>
-diff --git a/pom.xml b/pom.xml
-index 06cd996..6e4f1b2 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -382,14 +382,9 @@
-     <module>jetty-http-spi</module>
-     <module>jetty-jsp</module>
-     <module>jetty-distribution</module>
--    <module>test-continuation</module>
--    <!--module>test-continuation-jetty6</module-->
--    <module>test-jetty-servlet</module>
-     <module>test-jetty-webapp</module>
--    <module>test-jetty-nested</module>
-     <module>example-jetty-embedded</module>
-     <module>example-async-rest</module>
--    <module>tests</module>
-   </modules>
-   <dependencyManagement>
-     <dependencies>
--- 
-1.7.7.6
-
diff --git a/0003-Change-servelt-groupId-to-javax.servlet.patch b/0003-Change-servelt-groupId-to-javax.servlet.patch
deleted file mode 100644
index 352189d..0000000
--- a/0003-Change-servelt-groupId-to-javax.servlet.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 715883e87acb5a080d0591cd78b8b1c65cdda910 Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Tue, 24 Jan 2012 11:10:12 +0100
-Subject: [PATCH 3/8] Change servelt groupId to javax.servlet
-
----
- pom.xml |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index 6e4f1b2..691bf8d 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -15,6 +15,9 @@
-     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-     <jetty.url>http://www.eclipse.org/jetty</jetty.url>
-     <orbit-servlet-api-version>3.0.0.v201112011016</orbit-servlet-api-version>
-+    <servlet.spec.groupId>javax.servlet</servlet.spec.groupId>
-+    <servlet.spec.artifactId>servlet-api</servlet.spec.artifactId>
-+    <servlet.spec.version>3.0.20100224</servlet.spec.version>
-     <build-support-version>1.1</build-support-version>
-     <slf4j-version>1.6.1</slf4j-version>
-     <jetty-test-policy-version>1.2</jetty-test-policy-version>
--- 
-1.7.7.6
-
diff --git a/0005-Remove-pmd-plugin.patch b/0005-Remove-pmd-plugin.patch
deleted file mode 100644
index 71eb2c2..0000000
--- a/0005-Remove-pmd-plugin.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 561d02921266735f31bff5111c69741f5d9af648 Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Tue, 24 Jan 2012 11:15:56 +0100
-Subject: [PATCH 5/8] Remove pmd plugin
-
-- prevents problem with "Reporting mojo's can only be called from
-  ReportDocumentRender". Investigate proper fix some other time?
----
- pom.xml |   29 -----------------------------
- 1 files changed, 0 insertions(+), 29 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index 691bf8d..9eb07e2 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -171,35 +171,6 @@
-            </dependency>
-         </dependencies>
-       </plugin>
--      <plugin>
--        <groupId>org.apache.maven.plugins</groupId>
--        <artifactId>maven-pmd-plugin</artifactId>
--        <executions>
--          <execution>
--            <id>named-logging-enforcement</id>
--            <phase>compile</phase>
--            <goals>
--              <goal>check</goal>
--            </goals>
--            <configuration>
--              <verbose>true</verbose>
--            </configuration>
--          </execution>
--        </executions>
--        <configuration>
--          <targetJdk>1.6</targetJdk>
--          <rulesets>
--            <ruleset>jetty/pmd_logging_ruleset.xml</ruleset>
--          </rulesets>
--        </configuration>
--        <dependencies>
--          <dependency>
--            <groupId>org.eclipse.jetty.toolchain</groupId>
--            <artifactId>jetty-build-support</artifactId>
--            <version>${build-support-version}</version>
--          </dependency>
--        </dependencies>
--      </plugin>
-     </plugins>
-     <pluginManagement>
-       <plugins>
--- 
-1.7.7.6
-
diff --git a/0006-Remove-unpack-config-deps-from-distribution.patch b/0006-Remove-unpack-config-deps-from-distribution.patch
deleted file mode 100644
index 027af8e..0000000
--- a/0006-Remove-unpack-config-deps-from-distribution.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 560d5f75fed8bb44df915140c74512c7d95d1717 Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Tue, 27 Mar 2012 10:11:41 +0200
-Subject: [PATCH 6/8] Remove unpack-config-deps from distribution
-
-This is needed because original code used classifiers to select subset
-of artifacts. Unfortunately there seems to be a weird bug affecting even
-upstream maven when this goes outside of reactor resolver. Or perhaps
-this is a weird feature.
-
-Our resolver obviously can't handle this so we have to unpack these
-manually before building distribution
----
- jetty-distribution/pom.xml |   14 --------------
- 1 files changed, 0 insertions(+), 14 deletions(-)
-
-diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
-index aff91ff..8cd3aba 100644
---- a/jetty-distribution/pom.xml
-+++ b/jetty-distribution/pom.xml
-@@ -202,20 +202,6 @@
-             </configuration>
-           </execution>
-           <execution>
--            <id>unpack-config-deps</id>
--            <phase>generate-resources</phase>
--            <goals>
--              <goal>unpack-dependencies</goal>
--            </goals>
--            <configuration>
--              <includeGroupIds>org.eclipse.jetty</includeGroupIds>
--              <classifier>config</classifier>
--              <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
--              <excludes>META-INF/**</excludes>
--              <outputDirectory>${assembly-directory}</outputDirectory>
--            </configuration>
--          </execution>
--          <execution>
-             <id>copy-lib-monitor-deps</id>
-             <phase>generate-resources</phase>
-             <goals>
--- 
-1.7.7.6
-
diff --git a/0007-disable-jetty-osgi.patch b/0007-disable-jetty-osgi.patch
deleted file mode 100644
index 6720fc7..0000000
--- a/0007-disable-jetty-osgi.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 32ba8f2a4688759640570ba3b99d969a2ef53b55 Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Mon, 30 Apr 2012 16:24:57 +0200
-Subject: [PATCH 7/8] disable jetty-osgi
-
----
- jetty-jsp/pom.xml |    9 ++++++++-
- pom.xml           |   18 ------------------
- 2 files changed, 8 insertions(+), 19 deletions(-)
-
-diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml
-index 305766d..03e9965 100644
---- a/jetty-jsp/pom.xml
-+++ b/jetty-jsp/pom.xml
-@@ -48,11 +48,18 @@
-       <artifactId>com.sun.el</artifactId>
-       <version>2.2.0.v201108011116</version>
-     </dependency>
--    <!-- Eclipse Java Compiler (for JSP Compilation) -->
-+    <!-- Eclipse Java Compiler (for JSP Compilation). Replaced by
-+         glassfish
-     <dependency>
-       <groupId>org.eclipse.jetty.orbit</groupId>
-       <artifactId>org.eclipse.jdt.core</artifactId>
-       <version>3.7.1</version>
-+    </dependency> -->
-+
-+    <dependency>
-+      <groupId>org.glassfish.web</groupId>
-+      <artifactId>javax.servlet.jsp</artifactId>
-+      <version>2.2.3</version>
-     </dependency>
-   </dependencies>
- </project>
-diff --git a/pom.xml b/pom.xml
-index 9eb07e2..4575f76 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -351,7 +351,6 @@
-     <module>jetty-start</module>
-     <module>jetty-nested</module>
-     <module>jetty-overlay-deployer</module>
--    <module>jetty-osgi</module>
-     <module>jetty-nosql</module>
-     <module>jetty-http-spi</module>
-     <module>jetty-jsp</module>
-@@ -543,23 +542,6 @@
-       </modules>
-     </profile>
-     <profile>
--      <!--
--        Moves the jetty-osgi build tree to a profile called 'osgi'.
--        It is active by default, but being in a profile allows it to be
--        disabled via the "-P-osgi" command line on maven (if need be).
--        -->
--      <id>osgi</id>
--      <activation>
--        <activeByDefault>true</activeByDefault>
--        <file>
--          <exists>${basedir}/pom.xml</exists>
--        </file>
--      </activation>
--      <modules>
--        <module>jetty-osgi</module>
--      </modules>
--    </profile>
--    <profile>
-       <id>update-version</id>
-       <build>
-         <plugins>
--- 
-1.7.7.6
-
diff --git a/0008-Disable-jetty-nosql.patch b/0008-Disable-jetty-nosql.patch
deleted file mode 100644
index 4daa635..0000000
--- a/0008-Disable-jetty-nosql.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 36fc0972e0a8ea3fc67aa4f655c2ea24b0784a9a Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk@redhat.com>
-Date: Thu, 24 May 2012 13:39:02 +0200
-Subject: [PATCH 8/8] Disable jetty-nosql
-
----
- pom.xml |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index 4575f76..ca5c317 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -351,7 +351,6 @@
-     <module>jetty-start</module>
-     <module>jetty-nested</module>
-     <module>jetty-overlay-deployer</module>
--    <module>jetty-nosql</module>
-     <module>jetty-http-spi</module>
-     <module>jetty-jsp</module>
-     <module>jetty-distribution</module>
--- 
-1.7.7.6
-
diff --git a/jetty.spec b/jetty.spec
index 3847048..68bf1f2 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -56,14 +56,7 @@ Source1:        djetty.script
 Source3:        jetty.logrotate
 Source4:        %{name}-depmap.xml
 Source5:        %{name}.service
-Patch1:         0001-Remove-javadoc-execution.patch
-Patch2:         0002-Disable-test-artifacts.patch
-Patch3:         0003-Change-servelt-groupId-to-javax.servlet.patch
 Patch4:         0004-Modify-dependencies.patch
-Patch5:         0005-Remove-pmd-plugin.patch
-Patch6:         0006-Remove-unpack-config-deps-from-distribution.patch
-Patch7:         0007-disable-jetty-osgi.patch
-Patch8:         0008-Disable-jetty-nosql.patch
 
 BuildRequires:  geronimo-annotation
 BuildRequires:  geronimo-jaspic-spec
@@ -576,17 +569,41 @@ Requires:       jpackage-utils
 for f in $(find . -name "*.?ar"); do rm $f; done
 find . -name "*.class" -exec rm {} \;
 
-
-%patch1 -p1 -b .sav
-%patch2 -p1 -b .sav
-%patch3 -p1 -b .sav
 %patch4 -p1 -b .sav
-%patch5 -p1 -b .sav
-%patch6 -p1 -b .sav
-%if 0%{?rhel} > 0
-%patch7 -p1 -b .sav
-%patch8 -p1 -b .sav
-%endif
+
+# Remove javadoc execution
+# We generate javadoc as a separate step
+%pom_remove_plugin :maven-javadoc-plugin jetty-aggregate/jetty-all
+%pom_remove_dep :jetty-all jetty-distribution
+
+# Disable test artifacts
+# they need more dependencies then we have time for right now :-)
+%pom_disable_module tests
+%pom_disable_module test-continuation
+%pom_disable_module test-jetty-nested
+%pom_disable_module test-jetty-servlet
+%pom_disable_module test-jetty-osgi jetty-osgi
+
+# Change servelt groupId to javax.servlet
+%pom_xpath_inject "pom:project/pom:properties" "
+    <servlet.spec.groupId>javax.servlet</servlet.spec.groupId>
+    <servlet.spec.artifactId>servlet-api</servlet.spec.artifactId>
+    <servlet.spec.version>3.0.20100224</servlet.spec.version>"
+
+# Prevents problem with "Reporting mojo's can only be called from
+# ReportDocumentRender". Investigate proper fix some other time?
+%pom_remove_plugin :maven-pmd-plugin
+
+# Remove unpack-config-deps from distribution
+#
+# This is needed because original code used classifiers to select subset
+# of artifacts. Unfortunately there seems to be a weird bug affecting even
+# upstream maven when this goes outside of reactor resolver. Or perhaps
+# this is a weird feature.
+#
+# Our resolver obviously can't handle this so we have to unpack these
+# manually before building distribution
+%pom_xpath_remove "pom:execution[pom:id[text()='unpack-config-deps']]" jetty-distribution
 
 # Disable SPDY for now as there are missing dependencies
 # (like some TLS extensions for OpenJDK)
@@ -594,6 +611,24 @@ find . -name "*.class" -exec rm {} \;
 %pom_remove_dep org.eclipse.jetty.spdy: jetty-distribution
 %pom_xpath_remove "pom:execution[pom:id[text()='copy-spdy']]" jetty-distribution
 
+%if 0%{?rhel} > 0
+# Use Glassfish JSP
+%pom_remove_dep :org.eclipse.jdt.core jetty-jsp
+%pom_xpath_inject "pom:project/pom:dependencies" "
+    <dependency>
+      <groupId>org.glassfish.web</groupId>
+      <artifactId>javax.servlet.jsp</artifactId>
+      <version>any</version>
+    </dependency>" jetty-jsp
+
+# Disable OSGi
+%pom_disable_module jetty-osgi
+%pom_xpath_remove "pom:profile[pom:id[text()='osgi']]"
+
+# Disable NoSQL
+%pom_disable_module jetty-nosql
+%endif
+
 cp %{SOURCE1} djetty
 
 # this needs jetty6 things, so just remove it