diff --git a/.gitignore b/.gitignore
index 7bc30f0..c98ba3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /javapackages-0.7.2.tar.xz
 /javapackages-0.7.4.tar.xz
 /javapackages-0.7.5.tar.xz
+/javapackages-0.8.0.tar.xz
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index fc92448..84a19d8 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,6 +1,6 @@
 Name:           javapackages-tools
-Version:        0.7.5
-Release:        3%{?dist}
+Version:        0.8.0
+Release:        1%{?dist}
 Summary:        Macros and scripts for Java packaging support
 
 License:        BSD
@@ -33,6 +33,8 @@ Requires:       plexus-components-pom
 Requires:       plexus-pom
 Requires:       plexus-tools-pom
 Requires:       sonatype-oss-parent
+# Don't pull in xmvn yet, add it later on
+#Requires:       xmvn
 
 %description -n maven-local
 This package provides macros and scripts to support packaging Maven artifacts.
@@ -44,19 +46,21 @@ This package provides macros and scripts to support packaging Maven artifacts.
 %build
 
 %install
-install -m0755 -D depgenerators/maven.prov $RPM_BUILD_ROOT%{_rpmconfigdir}/maven.prov
-install -m0755 -D depgenerators/osgi.prov $RPM_BUILD_ROOT%{_rpmconfigdir}/osgi.prov
-install -m0755 -D depgenerators/osgi.req $RPM_BUILD_ROOT%{_rpmconfigdir}/osgi.req
-# Add the maven poms file attribute entry (rpm >= 4.9.0)
-install -m0644 -D depgenerators/fileattrs/maven.attr \
-                  $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/maven.attr
-install -m0644 -D depgenerators/fileattrs/osgi.attr \
-                  $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/osgi.attr
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}-utils
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/rpm
+install -d -m 755 $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs
 
-install -pm 644 -D macros.fjava ${RPM_BUILD_ROOT}%{_sysconfdir}/rpm/macros.fjava
-install -dm 755 $RPM_BUILD_ROOT%{_javadir}-utils/
-install -pm 644 scripts/maven_depmap.py $RPM_BUILD_ROOT%{_javadir}-utils/
-install -pm 644 scripts/pom_editor.sh $RPM_BUILD_ROOT%{_javadir}-utils/
+install -p -m 755 depgenerators/maven.prov $RPM_BUILD_ROOT%{_rpmconfigdir}
+install -p -m 755 depgenerators/osgi.prov $RPM_BUILD_ROOT%{_rpmconfigdir}
+install -p -m 755 depgenerators/osgi.req $RPM_BUILD_ROOT%{_rpmconfigdir}
+# Add the maven poms file attribute entry (rpm >= 4.9.0)
+install -p -m 644 depgenerators/fileattrs/maven.attr $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs
+install -p -m 644 depgenerators/fileattrs/osgi.attr $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs
+
+install -p -m 644 macros.fjava $RPM_BUILD_ROOT%{_sysconfdir}/rpm
+install -p -m 644 macros.xmvn $RPM_BUILD_ROOT%{_sysconfdir}/rpm
+install -p -m 644 scripts/maven_depmap.py $RPM_BUILD_ROOT%{_javadir}-utils
+install -p -m 644 scripts/pom_editor.sh $RPM_BUILD_ROOT%{_javadir}-utils
 
 
 # Ugly as hell, but Eclipse relocated various artifacts under
@@ -90,9 +94,14 @@ install -pm 644 scripts/pom_editor.sh $RPM_BUILD_ROOT%{_javadir}-utils/
 
 %files -n maven-local
 %{_mavendepmapfragdir}/%{name}
+%config(noreplace) %{_sysconfdir}/rpm/macros.xmvn
 
 
 %changelog
+* Wed Nov 28 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.8.0-1
+- Update to upstream version 0.8.0
+- Add xmvn macros
+
 * Tue Nov 27 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.7.5-3
 - Add BR: jpackage-utils
 
diff --git a/sources b/sources
index d433802..2a711f9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-51d2753c43f69fe096bf05d30f684e6c  javapackages-0.7.5.tar.xz
+daa52b3b673e1c2c36ec56ecda6007cb  javapackages-0.8.0.tar.xz