diff --git a/.gitignore b/.gitignore
index e054537..43c032b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /beust-jcommander-1.17.tar.xz
+/jcommander-1.30.tar.gz
diff --git a/beust-jcommander.spec b/beust-jcommander.spec
index 7919753..60b4e22 100644
--- a/beust-jcommander.spec
+++ b/beust-jcommander.spec
@@ -1,77 +1,49 @@
-
 %global short_name   jcommander
-%global group_id     com.beust
 
 Name:             beust-%{short_name}
-Version:          1.17
-Release:          6%{?dist}
+Version:          1.30
+Release:          1%{?dist}
 Summary:          Java framework for parsing command line parameters
 License:          ASL 2.0
 Group:            Development/Libraries
 URL:              http://jcommander.org/
-# git clone git://github.com/cbeust/jcommander.git
-# cd jcommander
-# git archive --prefix="beust-jcommander-1.17/" --format=tar jcommander-1.17 | xz > beust-jcommander-1.17.tar.xz
-Source0:          %{name}-%{version}.tar.xz
-
+Source0:          https://github.com/cbeust/%{short_name}/archive/%{short_name}-%{version}.tar.gz
 BuildArch:        noarch
-
-BuildRequires:    java-devel
-BuildRequires:    jpackage-utils
-BuildRequires:    maven
-BuildRequires:    maven-enforcer-plugin
-BuildRequires:    testng
-
-Requires:         java
-Requires:         jpackage-utils
+BuildRequires:    xmvn
 
 %description
-JCommander is a very small Java framework
-that makes it trivial to parse command line
-parameters (with annotations).
+JCommander is a very small Java framework that makes it trivial to
+parse command line parameters (with annotations).
 
 %package javadoc
 Summary:          API documentation for %{name}
 Group:            Documentation
-Requires:         jpackage-utils
 
 %description javadoc
-This package contains the API documentation for %{name}.
+This package contains the %{summary}.
 
 %prep
-%setup -q
-
-# removing spurious-executable-perm
+%setup -q -n %{short_name}-%{short_name}-%{version}
 chmod -x license.txt
 
 %build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_file : %{name}
+%mvn_build -f
 
 %install
-# jars
-install -d -m 755 %{buildroot}%{_javadir}
-install -p -m 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+%mvn_install
 
-# pom
-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 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
+%files -f .mfiles
 %doc license.txt notice.md README.markdown
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc license.txt notice.md
-%doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Jan 10 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.30-1
+- Update to upstream version 1.30
+- Build with xmvn
+
 * Thu Aug 16 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.17-6
 - Install NOTICE files
 
diff --git a/sources b/sources
index 1acbfb0..fe87532 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4cc69f21ca9f6d5bb08916bb97dd3016  beust-jcommander-1.17.tar.xz
+fe495dea15cf6891f08e9702ff7890dd  jcommander-1.30.tar.gz