diff --git a/.gitignore b/.gitignore
index 0cb14e5..a4bf56b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 maven-invoker-plugin-1.5.tgz
 /maven-invoker-plugin-1.5-source-release.zip
+/maven-invoker-plugin-1.6-source-release.zip
diff --git a/maven-invoker-plugin.spec b/maven-invoker-plugin.spec
index a48dafd..9b25009 100644
--- a/maven-invoker-plugin.spec
+++ b/maven-invoker-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-invoker-plugin
-Version:        1.5
-Release:        7%{?dist}
+Version:        1.6
+Release:        1%{?dist}
 Summary:        Maven Invoker Plugin
 
 Group:          Development/Libraries
@@ -27,6 +27,7 @@ BuildRequires: maven-surefire-provider-junit
 BuildRequires: maven-surefire-plugin
 BuildRequires: maven-plugin-cobertura
 BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-script-interpreter
 BuildRequires: maven-shared-invoker
 
 # Others
@@ -39,8 +40,7 @@ Requires: jpackage-utils
 Requires: maven-shared-invoker
 Requires: maven-shared-reporting-api
 Requires: maven-shared-reporting-impl
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
+Requires: maven-script-interpreter
 
 Provides:       maven2-plugin-invoker = 1:%{version}-%{release}
 Obsoletes:      maven2-plugin-invoker <= 0:2.0.8
@@ -62,33 +62,30 @@ API documentation for %{name}.
 %prep
 %setup -q 
 
+%pom_add_dep org.apache.maven:maven-core
+%pom_add_dep org.apache.maven:maven-compat
+
 %build
 mvn-rpmbuild \
         -Dmaven.test.failure.ignore=true \
-        install javadoc:javadoc
+        install javadoc:aggregate
 
 %install
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}
 install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
 
-%add_to_maven_depmap org.apache.maven.plugins maven-invoker-plugin %{version} JPP maven-invoker-plugin
-
 # poms
 install -d -m 755 %{buildroot}%{_mavenpomdir}
 install -pm 644 pom.xml \
     %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
 # javadoc
 install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
 %{_javadir}/*
 %{_mavenpomdir}/*
@@ -98,6 +95,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Aug 21 2012 Tomas Radej <tradej@redhat.com> - 1.6-1
+- Updated to v1.6
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index a779567..dc02e3c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5df332e1360956f46c3f42767dd78cd4  maven-invoker-plugin-1.5-source-release.zip
+268ecb9de4aa8f1ec3c5a14114793f53  maven-invoker-plugin-1.6-source-release.zip