diff --git a/.gitignore b/.gitignore
index fe9925c..49ce2ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 maven-release-2.0.tar.xz
 /maven-release-2.0.tar.xz
 /maven-release-2.2.tar.xz
+maven-release-2.2.1-source-release.zip
diff --git a/001-mavenrelease-skiptests.patch b/001-mavenrelease-skiptests.patch
deleted file mode 100644
index 54f80f1..0000000
--- a/001-mavenrelease-skiptests.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -u -r maven-release-2.2/maven-release-manager/pom.xml maven-release-2.2-patched/maven-release-manager/pom.xml
---- maven-release-2.2/maven-release-manager/pom.xml	2011-06-27 10:45:56.000000000 +0200
-+++ maven-release-2.2-patched/maven-release-manager/pom.xml	2011-07-18 18:01:32.961894470 +0200
-@@ -197,23 +197,6 @@
-       <version>${scmVersion}</version>
-       <scope>test</scope>
-     </dependency>
--    <dependency>
--      <groupId>jmock</groupId>
--      <artifactId>jmock</artifactId>
--      <scope>test</scope>
--    </dependency>
--    <dependency>
--      <groupId>jmock</groupId>
--      <artifactId>jmock-cglib</artifactId>
--      <version>1.0.1</version>
--      <scope>test</scope>
--    </dependency>
--    <dependency>
--      <groupId>org.mockito</groupId>
--      <artifactId>mockito-all</artifactId>
--      <version>1.8.5</version>
--      <scope>test</scope>
--    </dependency>
-   </dependencies>
- 
-   <build>
-diff -u -r maven-release-2.2/maven-release-plugin/pom.xml maven-release-2.2-patched/maven-release-plugin/pom.xml
---- maven-release-2.2/maven-release-plugin/pom.xml	2011-06-27 10:45:56.000000000 +0200
-+++ maven-release-2.2-patched/maven-release-plugin/pom.xml	2011-07-18 18:01:53.953909509 +0200
-@@ -95,11 +95,6 @@
-       <artifactId>jdom</artifactId>
-     </dependency>
-     <dependency>
--      <groupId>jmock</groupId>
--      <artifactId>jmock</artifactId>
--      <scope>test</scope>
--    </dependency>
--    <dependency>
-       <groupId>org.apache.maven.shared</groupId>
-       <artifactId>maven-plugin-testing-harness</artifactId>
-       <scope>test</scope>
diff --git a/maven-release.spec b/maven-release.spec
index c82f7ae..4ed9eb3 100644
--- a/maven-release.spec
+++ b/maven-release.spec
@@ -1,17 +1,12 @@
 Name:           maven-release
-Version:        2.2
-Release:        3%{?dist}
+Version:        2.2.1
+Release:        1%{?dist}
 Summary:        Release a project updating the POM and tagging in the SCM
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-release-plugin/
-# tar creation instructions
-# svn export http://svn.apache.org/repos/asf/maven/release/tags/maven-release-2.2 maven-release-2.2
-# tar cfJ maven-release-2.2.tar.xz maven-release-2.2 
-Source0:        maven-release-2.2.tar.xz
-# Remove jmock needed for tests and set source to 1.4 to support assert stmt
-Patch0:         001-mavenrelease-skiptests.patch
+Source0:        http://repo1.maven.org/maven2/org/apache/maven/release/%{name}/%{version}/%{name}-%{version}-source-release.zip
 # Remove deps needed for tests, till jmock gets packaged
 Patch1:         002-mavenrelease-fixbuild.patch
 BuildArch:      noarch
@@ -39,10 +34,6 @@ BuildRequires:  jaxen
 Requires:       java 
 Requires:       jpackage-utils
 
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
-
-
 %description
 This plugin is used to release a project with Maven, saving a lot of 
 repetitive, manual work. Releasing a project is made in two steps: 
@@ -54,7 +45,6 @@ Summary:        Release a project updating the POM and tagging in the SCM
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       jpackage-utils
-BuildArch:      noarch
 
 %description manager
 This package contains %{name}-manager needed by %{name}-plugin.
@@ -65,7 +55,6 @@ Summary:        Release a project updating the POM and tagging in the SCM
 Group:          Development/Libraries
 Requires:       %{name}-manager = %{version}-%{release}
 Requires:       jpackage-utils
-BuildArch:      noarch
 
 %description plugin
 This plugin is used to release a project with Maven, saving a lot of
@@ -80,7 +69,6 @@ Requires:       %{name} = %{version}-%{release}
 Requires:       jpackage-utils
 Obsoletes:      %{name}-manager-javadoc <= 2.0-1
 Obsoletes:      %{name}-plugin-javadoc <= 2.0-1
-BuildArch:      noarch
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -88,7 +76,6 @@ This package contains the API documentation for %{name}.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
 %patch1 -p1
 cat > README << EOT
 %{name}-%{version}
@@ -123,35 +110,32 @@ install -pm 644 %{name}-manager/pom.xml  \
 install -pm 644 %{name}-plugin/pom.xml  \
   $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-plugin.pom
 
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%add_maven_depmap JPP-%{name}.pom
 %add_maven_depmap JPP-%{name}-manager.pom %{name}-manager.jar
 %add_maven_depmap JPP-%{name}-plugin.pom %{name}-plugin.jar
 
 %files
-%defattr(-,root,root,-)
 %doc README
 %{_mavenpomdir}/JPP-%{name}.pom
 %{_mavendepmapfragdir}/*
 
-
 %files manager
-%defattr(-,root,root,-)
 %{_javadir}/*manager*
 %{_mavenpomdir}/JPP-%{name}-manager.pom
 
-
 %files plugin
-%defattr(-,root,root,-)
 %{_javadir}/*plugin*
 %{_mavenpomdir}/JPP-%{name}-plugin.pom
 
-
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
 
 %changelog
+* Tue Nov 29 2011 Alexander Kurtakov <akurtako@redhat.com> 2.2.1-1
+- Update to latest upstream release.
+- Adapt to current guidelines.
+
 * Tue Jul 26 2011 Guido Grazioli <guido.grazioli@gmail.com> - 2.2-3
 - Reinclude maven-scm-test in BRs
 
diff --git a/sources b/sources
index 0bc1a45..cfe0cf1 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 1d135afb48bf3841f4ec4c9db5b57234  maven-release-2.2.tar.xz
+adfb662ff2b604e46b1466b369dce8a7  maven-release-2.2.1-source-release.zip