diff --git a/.gitignore b/.gitignore
index 5d30e15..46d6b05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 maven-dependency-plugin-2.2.tar.xz
+/maven-dependency-plugin-2.2-source-release.zip
diff --git a/maven-dependency-plugin.spec b/maven-dependency-plugin.spec
index 872c336..29d692d 100644
--- a/maven-dependency-plugin.spec
+++ b/maven-dependency-plugin.spec
@@ -1,17 +1,12 @@
 Name:           maven-dependency-plugin
 Version:        2.2
-Release:        0.4.svn949573%{?dist}
+Release:        1%{?dist}
 Summary:        Plugin to manipulate, copy and unpack local and remote artifacts
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/%{name}
-# we are not using release tag 2.1 because last release has problems with
-# our dependencies and there are 2 outstanding bugs before 2.2 release.
-# svn export -r 949573 http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin maven-dependency-plugin-2.2
-# tar caf maven-dependency-plugin-2.2.tar.xz maven-dependency-plugin-2.2
-Source0:        %{name}-%{version}.tar.xz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
 
 BuildArch:      noarch
 
@@ -19,7 +14,7 @@ BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: plexus-utils
 BuildRequires: ant-nodeps
 BuildRequires: asm2
-BuildRequires: maven2
+BuildRequires: maven
 BuildRequires: maven-install-plugin
 BuildRequires: maven-compiler-plugin
 BuildRequires: maven-plugin-plugin
@@ -31,7 +26,7 @@ BuildRequires: maven-javadoc-plugin
 BuildRequires: maven-shared-dependency-analyzer
 BuildRequires: maven-shared-dependency-tree
 BuildRequires: maven-shared-common-artifact-filters
-Requires: maven2
+Requires: maven
 Requires: jpackage-utils
 Requires: java
 Requires: maven-shared-common-artifact-filters
@@ -58,31 +53,21 @@ Requires:       jpackage-utils
 
 
 %prep
-%setup -q #You may need to update this according to your Source0
+%setup -q 
 
-# we have newer classworlds in Fedora, so fix test case
 sed -i \
     's:org.codehaus.classworlds.ClassRealm:org.codehaus.plexus.classworlds.realm.ClassRealm:' \
     src/test/java/org/apache/maven/plugin/dependency/its/AbstractDependencyPluginITCase.java
 
+
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-# tests failures are ignored because they are failing in jpp mode
-# Need more time to investigate/fix this
-mvn-jpp \
-        -e \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
         -Dmaven.test.failure.ignore=true \
         install javadoc:javadoc
 
 %install
-rm -rf %{buildroot}
-
 # jars
-install -Dpm 644 target/%{name}-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
-    do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 
 %add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}
 
@@ -90,10 +75,8 @@ install -Dpm 644 target/%{name}-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/
 install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
 # javadoc
-install -dm 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-rm -rf target/site/api*
+install -dm 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
 %post
 %update_maven_depmap
@@ -101,9 +84,6 @@ rm -rf target/site/api*
 %postun
 %update_maven_depmap
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
 %{_javadir}/*
@@ -112,10 +92,12 @@ rm -rf %{buildroot}
 
 %files javadoc
 %defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Apr 26 2011 Alexander Kurtakov <akurtako@redhat.com> 2.2-1
+- Update to 2.2 final release.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2-0.4.svn949573
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 09db71a..9d06924 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-040ef38f8633b11ca0cf8fe63eb1f2a5  maven-dependency-plugin-2.2.tar.xz
+eaf703fd03dbfa3e0f78430623bbd63a  maven-dependency-plugin-2.2-source-release.zip