diff --git a/.gitignore b/.gitignore
index 2622ee9..0c2b711 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 maven-assembly-plugin-2.2-beta-5-src.tar.gz
 maven-assembly-plugin-2.2-source-release.zip
+maven-assembly-plugin-2.2.1-source-release.zip
diff --git a/maven-assembly-plugin.spec b/maven-assembly-plugin.spec
index 74c854b..8736fc1 100644
--- a/maven-assembly-plugin.spec
+++ b/maven-assembly-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-assembly-plugin
-Version:        2.2
-Release:        2%{?dist}
+Version:        2.2.1
+Release:        1%{?dist}
 Summary:        Maven Assembly Plugin
 
 Group:          Development/Libraries
@@ -16,8 +16,8 @@ Provides:  maven2-plugin-assembly = 1:%{version}-%{release}
 
 BuildRequires: java >= 1:1.6.0
 BuildRequires: jpackage-utils >= 0:1.7.2
-BuildRequires:  ant, ant-nodeps
-BuildRequires:  maven2 >= 0:2.0.4-9
+BuildRequires:  ant
+BuildRequires:  maven
 BuildRequires:  maven-assembly-plugin
 BuildRequires:  maven-compiler-plugin
 BuildRequires:  maven-install-plugin
@@ -25,7 +25,7 @@ BuildRequires:  maven-jar-plugin
 BuildRequires:  maven-resources-plugin
 BuildRequires:  maven-site-plugin
 BuildRequires:  maven-plugin-plugin
-BuildRequires:  maven-surefire-maven-plugin
+BuildRequires:  maven-surefire-plugin
 BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  maven-javadoc-plugin
 BuildRequires:  maven-shared-filtering
@@ -88,19 +88,14 @@ mkdir -p target/classes/
 cp -pr src/main/resources/META-INF/ target/classes/
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 # seems koji don't have easymockclassextension
-mvn-jpp \
+mvn-rpmbuild \
         -e \
-        -Dmaven2.jpp.mode=true \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        -Dmaven2.jpp.depmap.file=%{SOURCE1} \
+        -Dmaven.local.depmap.file=%{SOURCE1} \
         -Dmaven.test.skip=true \
         install javadoc:javadoc
 
 %install
-rm -rf %{buildroot}
-
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}
 install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
@@ -134,6 +129,9 @@ rm -rf target/site/api*
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Mar 17 2011 Alexander Kurtakov <akurtako@redhat.com> 2.2.1-1
+- Update to upstream 2.2.1 release.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index b70937d..b673bd6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-db8cff1a3bf57fca8ba3899d053d48f2  maven-assembly-plugin-2.2-beta-5-src.tar.gz
-eec14f1ba55f53710542e85562a7b003  maven-assembly-plugin-2.2-source-release.zip
+62c1483e35a3d231c1fd1de614ec6e46  maven-assembly-plugin-2.2.1-source-release.zip