diff --git a/.gitignore b/.gitignore
index 3807249..7189db8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ maven-plugin-tools-2.1-src.tar.gz
 maven-plugin-tools-2.6.tar.xz
 maven-plugin-tools-2.7-source-release.zip
 /maven-plugin-tools-3.1-source-release.zip
+/maven-plugin-tools-3.3-source-release.zip
diff --git a/maven-plugin-tools-maven-3.1.1.patch b/maven-plugin-tools-maven-3.1.1.patch
deleted file mode 100644
index 662ba36..0000000
--- a/maven-plugin-tools-maven-3.1.1.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-From 84ce30d4677ad55d7b0253a2e67f08fc98795224 Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk@redhat.com>
-Date: Mon, 27 Jan 2014 10:40:41 +0100
-Subject: [PATCH] Update to Maven 3.1.1
-
----
- maven-plugin-plugin/pom.xml            | 18 ------------------
- maven-plugin-tools-annotations/pom.xml |  4 ++--
- maven-plugin-tools-ant/pom.xml         |  6 +-----
- maven-plugin-tools-api/pom.xml         |  6 +-----
- maven-plugin-tools-beanshell/pom.xml   |  8 ++++----
- maven-plugin-tools-generators/pom.xml  |  8 --------
- maven-plugin-tools-java/pom.xml        |  6 +-----
- maven-plugin-tools-model/pom.xml       |  2 +-
- maven-script/maven-script-ant/pom.xml  |  8 --------
- pom.xml                                |  9 ++-------
- 10 files changed, 12 insertions(+), 63 deletions(-)
-
-diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
-index 463b6d1..7e064e8 100644
---- a/maven-plugin-plugin/pom.xml
-+++ b/maven-plugin-plugin/pom.xml
-@@ -91,19 +91,6 @@
-       <version>${mavenVersion}</version>
-     </dependency>
-     <dependency>
--      <groupId>org.apache.maven</groupId>
--      <artifactId>maven-project</artifactId>
--    </dependency>
--    <dependency>
--      <groupId>org.apache.maven</groupId>
--      <artifactId>maven-plugin-descriptor</artifactId>
--    </dependency>
--    <dependency>
--      <groupId>org.apache.maven</groupId>
--      <artifactId>maven-plugin-registry</artifactId>
--      <version>${mavenVersion}</version>
--    </dependency>
--    <dependency>
-       <groupId>org.apache.maven.plugin-tools</groupId>
-       <artifactId>maven-plugin-tools-api</artifactId>
-     </dependency>
-@@ -114,11 +101,6 @@
- 
-     <dependency>
-       <groupId>org.apache.maven</groupId>
--      <artifactId>maven-artifact-manager</artifactId>
--      <version>${mavenVersion}</version>
--    </dependency>
--    <dependency>
--      <groupId>org.apache.maven</groupId>
-       <artifactId>maven-artifact</artifactId>
-     </dependency>
- 
-diff --git a/maven-plugin-tools-annotations/pom.xml b/maven-plugin-tools-annotations/pom.xml
-index 792a608..440d73d 100644
---- a/maven-plugin-tools-annotations/pom.xml
-+++ b/maven-plugin-tools-annotations/pom.xml
-@@ -34,7 +34,7 @@
-     <!-- maven -->
-     <dependency>
-       <groupId>org.apache.maven</groupId>
--      <artifactId>maven-project</artifactId>
-+      <artifactId>maven-core</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.maven</groupId>
-@@ -42,7 +42,7 @@
-     </dependency>
-     <dependency>
-       <groupId>org.apache.maven</groupId>
--      <artifactId>maven-plugin-descriptor</artifactId>
-+      <artifactId>maven-compat</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.maven.plugin-tools</groupId>
-diff --git a/maven-plugin-tools-ant/pom.xml b/maven-plugin-tools-ant/pom.xml
-index bad49ce..bba4bf5 100644
---- a/maven-plugin-tools-ant/pom.xml
-+++ b/maven-plugin-tools-ant/pom.xml
-@@ -37,11 +37,7 @@
-     <!-- maven -->
-     <dependency>
-       <groupId>org.apache.maven</groupId>
--      <artifactId>maven-project</artifactId>
--    </dependency>
--    <dependency>
--      <groupId>org.apache.maven</groupId>
--      <artifactId>maven-plugin-descriptor</artifactId>
-+      <artifactId>maven-core</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.maven.plugin-tools</groupId>
-diff --git a/maven-plugin-tools-api/pom.xml b/maven-plugin-tools-api/pom.xml
-index 8c76482..4f10e07 100644
---- a/maven-plugin-tools-api/pom.xml
-+++ b/maven-plugin-tools-api/pom.xml
-@@ -37,7 +37,7 @@
-     <!-- maven -->
-     <dependency>
-       <groupId>org.apache.maven</groupId>
--      <artifactId>maven-project</artifactId>
-+      <artifactId>maven-core</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.maven</groupId>
-@@ -51,10 +51,6 @@
-       <groupId>org.apache.maven</groupId>
-       <artifactId>maven-artifact</artifactId>
-     </dependency>
--    <dependency>
--      <groupId>org.apache.maven</groupId>
--      <artifactId>maven-plugin-descriptor</artifactId>
--    </dependency>
- 
-     <!-- plexus -->
-     <dependency>
-diff --git a/maven-plugin-tools-beanshell/pom.xml b/maven-plugin-tools-beanshell/pom.xml
-index 598bb01..bcbb3f8 100644
---- a/maven-plugin-tools-beanshell/pom.xml
-+++ b/maven-plugin-tools-beanshell/pom.xml
-@@ -36,12 +36,12 @@
-   <dependencies>
-     <!-- maven -->
-     <dependency>
--      <groupId>org.apache.maven.plugin-tools</groupId>
--      <artifactId>maven-plugin-tools-api</artifactId>
-+      <groupId>org.apache.maven</groupId>
-+      <artifactId>maven-core</artifactId>
-     </dependency>
-     <dependency>
--      <groupId>org.apache.maven</groupId>
--      <artifactId>maven-plugin-descriptor</artifactId>
-+      <groupId>org.apache.maven.plugin-tools</groupId>
-+      <artifactId>maven-plugin-tools-api</artifactId>
-     </dependency>
- 
-     <dependency>
-diff --git a/maven-plugin-tools-generators/pom.xml b/maven-plugin-tools-generators/pom.xml
-index fadf80e..499032d 100644
---- a/maven-plugin-tools-generators/pom.xml
-+++ b/maven-plugin-tools-generators/pom.xml
-@@ -42,16 +42,8 @@
-     <!-- maven -->
-     <dependency>
-       <groupId>org.apache.maven</groupId>
--      <artifactId>maven-project</artifactId>
--    </dependency>
--    <dependency>
--      <groupId>org.apache.maven</groupId>
-       <artifactId>maven-model</artifactId>
-     </dependency>
--    <dependency>
--      <groupId>org.apache.maven</groupId>
--      <artifactId>maven-plugin-descriptor</artifactId>
--    </dependency>
- 
-     <dependency>
-       <groupId>org.apache.maven.reporting</groupId>
-diff --git a/maven-plugin-tools-java/pom.xml b/maven-plugin-tools-java/pom.xml
-index e954e92..8d2faa9 100644
---- a/maven-plugin-tools-java/pom.xml
-+++ b/maven-plugin-tools-java/pom.xml
-@@ -43,17 +43,13 @@
-     <!-- maven -->
-     <dependency>
-       <groupId>org.apache.maven</groupId>
--      <artifactId>maven-project</artifactId>
-+      <artifactId>maven-core</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.apache.maven</groupId>
-       <artifactId>maven-model</artifactId>
-     </dependency>
-     <dependency>
--      <groupId>org.apache.maven</groupId>
--      <artifactId>maven-plugin-descriptor</artifactId>
--    </dependency>
--    <dependency>
-       <groupId>org.apache.maven.plugin-tools</groupId>
-       <artifactId>maven-plugin-tools-api</artifactId>
-     </dependency>
-diff --git a/maven-plugin-tools-model/pom.xml b/maven-plugin-tools-model/pom.xml
-index 5afb8fb..aa2f81f 100644
---- a/maven-plugin-tools-model/pom.xml
-+++ b/maven-plugin-tools-model/pom.xml
-@@ -37,7 +37,7 @@
-     <!-- maven -->
-     <dependency>
-       <groupId>org.apache.maven</groupId>
--      <artifactId>maven-plugin-descriptor</artifactId>
-+      <artifactId>maven-plugin-api</artifactId>
-     </dependency>
- 
-     <!-- plexus -->
-diff --git a/maven-script/maven-script-ant/pom.xml b/maven-script/maven-script-ant/pom.xml
-index e11e009..721d547 100644
---- a/maven-script/maven-script-ant/pom.xml
-+++ b/maven-script/maven-script-ant/pom.xml
-@@ -56,14 +56,6 @@ under the License.
-       <artifactId>plexus-container-default</artifactId>
-     </dependency>
-     <dependency>
--      <groupId>org.apache.maven</groupId>
--      <artifactId>maven-project</artifactId>
--    </dependency>
--    <dependency>
--      <groupId>org.apache.maven</groupId>
--      <artifactId>maven-plugin-descriptor</artifactId>
--    </dependency>
--    <dependency>
-       <groupId>org.codehaus.plexus</groupId>
-       <artifactId>plexus-archiver</artifactId>
-       <version>1.0-alpha-11</version>
-diff --git a/pom.xml b/pom.xml
-index 58444cb..8374848 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -160,7 +160,7 @@
- 
-   <properties>
-     <pluginTestingHarnessVersion>1.2</pluginTestingHarnessVersion>
--    <mavenVersion>2.2.1</mavenVersion>
-+    <mavenVersion>3.1.1</mavenVersion>
-     <antVersion>1.7.1</antVersion>
-     <mavenInvokerPluginVersion>1.6</mavenInvokerPluginVersion>
-   </properties>
-@@ -210,12 +210,7 @@
-       </dependency>
-       <dependency>
-         <groupId>org.apache.maven</groupId>
--        <artifactId>maven-project</artifactId>
--        <version>${mavenVersion}</version>
--      </dependency>
--      <dependency>
--        <groupId>org.apache.maven</groupId>
--        <artifactId>maven-plugin-descriptor</artifactId>
-+        <artifactId>maven-compat</artifactId>
-         <version>${mavenVersion}</version>
-       </dependency>
-       <dependency>
--- 
-1.8.4.2
-
diff --git a/maven-plugin-tools-rhbz-920042.patch b/maven-plugin-tools-rhbz-920042.patch
deleted file mode 100644
index 1c316e6..0000000
--- a/maven-plugin-tools-rhbz-920042.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0681545ce57c55b8c35af8189a0f2bfe27256fd7 Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk@redhat.com>
-Date: Mon, 11 Mar 2013 12:40:04 +0100
-Subject: [PATCH] Fix MPLUGIN-242
-
-This fixes upstream bug MPLUGIN-242:
-NullPointerException in MojoClassVisitor.visit()
-See: http://jira.codehaus.org/browse/MPLUGIN-242
----
- .../plugin/annotations/scanner/visitors/MojoClassVisitor.java      | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java
-index be0e70b..c381cf9 100644
---- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java
-+++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java
-@@ -105,8 +105,11 @@ public class MojoClassVisitor
-     public void visit( int version, int access, String name, String signature, String superName, String[] interfaces )
-     {
-         mojoAnnotatedClass = new MojoAnnotatedClass();
--        mojoAnnotatedClass.setClassName( Type.getObjectType( name ).getClassName() ).setParentClassName(
--            Type.getObjectType( superName ).getClassName() );
-+        mojoAnnotatedClass.setClassName( Type.getObjectType( name ).getClassName() );
-+        if ( superName != null)
-+        {
-+            mojoAnnotatedClass.setParentClassName( Type.getObjectType( superName ).getClassName() );
-+        }
-         logger.debug( "MojoClassVisitor#visit" );
-     }
- 
--- 
-1.8.1.2
-
diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec
index f329f08..e9c850d 100644
--- a/maven-plugin-tools.spec
+++ b/maven-plugin-tools.spec
@@ -1,6 +1,6 @@
 Name:           maven-plugin-tools
-Version:        3.1
-Release:        20%{?dist}
+Version:        3.3
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Maven Plugin Tools
 
@@ -9,16 +9,7 @@ URL:            http://maven.apache.org/plugin-tools/
 Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugin-tools/%{name}/%{version}/%{name}-%{version}-source-release.zip
 BuildArch:      noarch
 
-# Fix NullPointerException in MojoClassVisitor.visit()
-# See: rhbz#920042, http://jira.codehaus.org/browse/MPLUGIN-242
-Patch0:         %{name}-rhbz-920042.patch
-# Use Maven 3.1.1 APIs
-Patch1:         %{name}-maven-3.1.1.patch
-
 BuildRequires:  maven-local
-BuildRequires:  mvn(asm:asm)
-BuildRequires:  mvn(asm:asm-commons)
-BuildRequires:  mvn(bsh:bsh)
 BuildRequires:  mvn(com.sun:tools)
 BuildRequires:  mvn(com.thoughtworks.qdox:qdox)
 BuildRequires:  mvn(net.sf.jtidy:jtidy)
@@ -30,7 +21,7 @@ BuildRequires:  mvn(org.apache.maven:maven-artifact)
 BuildRequires:  mvn(org.apache.maven:maven-compat)
 BuildRequires:  mvn(org.apache.maven:maven-core)
 BuildRequires:  mvn(org.apache.maven:maven-model)
-BuildRequires:  mvn(org.apache.maven:maven-parent)
+BuildRequires:  mvn(org.apache.maven:maven-parent:pom:)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
 BuildRequires:  mvn(org.apache.maven:maven-repository-metadata)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
@@ -39,16 +30,20 @@ BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
 BuildRequires:  mvn(org.apache.maven.reporting:maven-reporting-api)
 BuildRequires:  mvn(org.apache.maven.reporting:maven-reporting-impl)
 BuildRequires:  mvn(org.apache.velocity:velocity)
+BuildRequires:  mvn(org.beanshell:bsh)
 BuildRequires:  mvn(org.codehaus.modello:modello-maven-plugin)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-ant-factory)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-archiver)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-bsh-factory)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-compiler-manager)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-component-annotations)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-container-default)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-velocity)
-
+BuildRequires:  mvn(org.ow2.asm:asm)
+BuildRequires:  mvn(org.ow2.asm:asm-commons)
+BuildRequires:  mvn(xmlunit:xmlunit)
 
 %description
 The Maven Plugin Tools contains the necessary tools to be able to produce Maven
@@ -173,8 +168,6 @@ API documentation for %{name}.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 # For easier installation
 ln -s maven-script/maven-script-{ant,beanshell} .
@@ -190,6 +183,38 @@ ln -s maven-script/maven-script-{ant,beanshell} .
 # Remove test dependencies because tests are skipped anyways.
 %pom_xpath_remove "pom:dependency[pom:scope='test']"
 
+# Use Maven 3.1.1 APIs
+%pom_remove_dep :maven-project maven-plugin-plugin
+%pom_remove_dep :maven-plugin-descriptor maven-plugin-plugin
+%pom_remove_dep :maven-plugin-registry maven-plugin-plugin
+%pom_remove_dep :maven-artifact-manager maven-plugin-plugin
+
+%pom_change_dep :maven-project :maven-core maven-plugin-tools-annotations
+%pom_change_dep :maven-plugin-descriptor :maven-compat maven-plugin-tools-annotations
+
+%pom_remove_dep :maven-plugin-descriptor maven-plugin-tools-ant
+%pom_change_dep :maven-project :maven-core maven-plugin-tools-ant
+
+%pom_remove_dep :maven-plugin-descriptor maven-plugin-tools-api
+%pom_change_dep :maven-project :maven-core maven-plugin-tools-api
+
+%pom_remove_dep :maven-plugin-descriptor maven-plugin-tools-beanshell
+
+%pom_remove_dep :maven-project maven-plugin-tools-generators
+%pom_remove_dep :maven-plugin-descriptor maven-plugin-tools-generators
+
+%pom_change_dep :maven-project :maven-core maven-plugin-tools-java
+%pom_remove_dep :maven-plugin-descriptor maven-plugin-tools-java
+
+%pom_change_dep :maven-plugin-descriptor :maven-plugin-api maven-plugin-tools-model
+
+%pom_remove_dep :maven-project maven-script/maven-script-ant
+%pom_remove_dep :maven-plugin-descriptor maven-script/maven-script-ant
+
+%pom_remove_dep :maven-project
+%pom_remove_dep :maven-plugin-descriptor
+%pom_add_dep org.apache.maven:maven-compat
+
 %build
 %mvn_build -s -f
 
@@ -232,6 +257,9 @@ ln -s maven-script/maven-script-{ant,beanshell} .
 
 
 %changelog
+* Thu Jun 19 2014 Michal Srb <msrb@redhat.com> - 0:3.3-1
+- Update to upstream version 3.3
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:3.1-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 0c89f75..1af8a59 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb89380c61047753cbbacdba9375f168  maven-plugin-tools-3.1-source-release.zip
+221733f6197b04a0f6cf11ef40443fcd  maven-plugin-tools-3.3-source-release.zip