diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ce15345
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/plexus-utils-2.0.6.tar.bz2
diff --git a/plexus-utils-remove-release-plugin.patch b/plexus-utils-remove-release-plugin.patch
deleted file mode 100644
index ebc3e41..0000000
--- a/plexus-utils-remove-release-plugin.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- plexus-utils-2.0.5/pom.xml.orig	2010-05-05 10:35:10.289442289 +0100
-+++ plexus-utils-2.0.5/pom.xml	2010-05-05 10:35:37.167378010 +0100
-@@ -76,13 +76,6 @@
-           </systemProperties>
-         </configuration>
-       </plugin>
--      <plugin>
--        <groupId>org.apache.maven.plugins</groupId>
--        <artifactId>maven-release-plugin</artifactId>
--        <configuration>
--          <tagBase>https://svn.codehaus.org/plexus/plexus-utils/tags/</tagBase>
--        </configuration>
--      </plugin>
-     </plugins>
-   </build>
- </project>
diff --git a/plexus-utils.spec b/plexus-utils.spec
index 7dcf1bb..5b82984 100644
--- a/plexus-utils.spec
+++ b/plexus-utils.spec
@@ -28,19 +28,19 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define parent plexus
-%define subname utils
+%global parent plexus
+%global subname utils
 
 Name:           plexus-utils
-Version:        2.0.5
-Release:        3%{?dist}
+Version:        2.0.6
+Release:        1%{?dist}
 Summary:        Plexus Common Utilities
 License:        ASL 1.1 and ASL 2.0 and MIT
 Group:          Development/Libraries
 URL:            http://plexus.codehaus.org/
-Source0:        plexus-utils-%{version}.tar.gz
-# svn export http://svn.codehaus.org/plexus/plexus-utils/tags/plexus-utils-2.0.1/
-Patch0:         plexus-utils-remove-release-plugin.patch
+# git clone git://github.com/sonatype/sisu
+# git archive --prefix="plexus-utils-2.0.6/" --format=tar plexus-utils-2.0.6 | bzip2 > plexus-utils-2.0.6.tar.bz2
+Source0:        plexus-utils-%{version}.tar.bz2
 
 BuildArch:      noarch
 BuildRequires:  jpackage-utils >= 0:1.6
@@ -79,15 +79,9 @@ Javadoc for %{name}.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp \
-    -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-    install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc
 
 %install
 # jars
@@ -129,6 +123,11 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Mon Feb 28 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.0.6-1
+- Update to 2.0.6
+- Remove obsolete patches
+- Use maven 3 to build
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index ebc9282..c2e14d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-58d8df8781da14817dde8dd548a15e2e  plexus-utils-2.0.5.tar.gz
+ccf88aa71e17bbf6c15b69d6277a13a8  plexus-utils-2.0.6.tar.bz2