diff --git a/.cvsignore b/.cvsignore
index fd64dd1..f69ad6e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-maven-scm-1.2.tar.gz
+maven-scm-1.2.tar.xz
diff --git a/maven-scm.spec b/maven-scm.spec
index 3f50e72..65690e2 100644
--- a/maven-scm.spec
+++ b/maven-scm.spec
@@ -28,12 +28,12 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define maven_settings_file %{_builddir}/%{name}/settings.xml
-%define namedversion 1.2
+%global maven_settings_file %{_builddir}/%{name}/settings.xml
+%global namedversion 1.2
 
 Name:           maven-scm
 Version:        1.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Epoch:          0
 Summary:        Common API for doing SCM operations
 License:        ASL 2.0
@@ -42,8 +42,8 @@ URL:            http://maven.apache.org/scm
 
 # svn export 
 #   http://svn.apache.org/repos/asf//maven/scm/tags/maven-scm-1.2/ maven-scm-1.2/
-# tar czf maven-scm-1.2.tar.gz maven-scm-1.2/
-Source0:        %{name}-%{namedversion}.tar.gz
+# tar cJf maven-scm-1.2.tar.xz maven-scm-1.2/
+Source0:        %{name}-%{namedversion}.tar.xz
 Source1:        %{name}-jpp-depmap.xml
 Source2:        %{name}-mapdeps.xsl
 Source3:        %{name}-add-plexusutils-dep.xml
@@ -66,7 +66,7 @@ BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven2-plugin-assembly
 BuildRequires:  maven-surefire-maven-plugin
 BuildRequires:  maven-surefire-provider-junit
-BuildRequires:  maven2-common-poms >= 1.0-3
+BuildRequires:  maven2-common-poms >= 0:1.0-13
 BuildRequires:  modello >= 1.0-0.a8
 BuildRequires:  modello-maven-plugin >= 1.0-0.a8
 BuildRequires:  netbeans-ide >= 6.7.1
@@ -170,6 +170,12 @@ cp -p pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-scm-scm.pom
 
 %add_to_maven_depmap org.apache.maven.plugins maven-scm-plugin %{namedversion} JPP/maven-scm plugin
 
+# link cvsclient.jar in the right place; this has to be moved to netbeans-lib
+# when cvsclient will be split in a subpackage
+ln -s %{_datadir}/netbeans/ide12/modules/org-netbeans-lib-cvsclient.jar \
+  $RPM_BUILD_ROOT/%{_javadir}/cvsclient.jar
+
+
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
@@ -195,15 +201,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%dir %{_javadir}
 %dir %{_javadir}/%{name}
-%{_datadir}/maven2
 %{_javadir}/%{name}/api*
 %{_javadir}/%{name}/client*
 %{_javadir}/%{name}/manager-plexus*
 %{_javadir}/%{name}/plugin*
 %{_javadir}/%{name}/provider-*
-%{_mavendepmapfragdir}
+%{_javadir}/cvsclient.jar
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
 
 %files test
 %defattr(-,root,root,-)
@@ -216,6 +222,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/*
 
 %changelog
+* Mon May 10 2010 Guido Grazioli <guido.grazioli@gmail.com> 0:1.2-6
+- Link netbeans-lib-cvsclient jar in the right place.
+- Switch to xz compression.
+- Sanitize files owned.
+- Use %%global.
+
 * Mon Feb 8 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.2-5
 - Fix BR/Rs for netbeans-ide[version] to netbeans-ide rename.
 
diff --git a/sources b/sources
index 00eaaf6..ca30b30 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-0c5a74ab3350d80fb2a2072eb3c7a096  maven-scm-1.0-rc1.tar.gz
-c4a4502e9cd656ffa8701d411584a3de  maven-scm-1.2.tar.gz
+10bbaebae8909507ae612c2535ba28e0  maven-scm-1.2.tar.xz