diff --git a/.gitignore b/.gitignore
index 3c66e36..35e5adc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /cxf-xjc-utils-2.6.0.tar.xz
+/cxf-xjc-utils-2.6.2.tar.xz
diff --git a/cxf-xjc-utils-2.6.0-pom.patch b/cxf-xjc-utils-2.6.0-pom.patch
deleted file mode 100644
index 8d5da2c..0000000
--- a/cxf-xjc-utils-2.6.0-pom.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur -x '*java' cxf-xjc-utils-2.6.0/pom.xml cxf-xjc-utils-2.6.0-work/pom.xml
---- cxf-xjc-utils-2.6.0/pom.xml	2012-03-30 17:47:45.856348000 +0200
-+++ cxf-xjc-utils-2.6.0-work/pom.xml	2012-05-17 15:13:33.660366727 +0200
-@@ -172,16 +172,6 @@
-     <build>
-         <defaultGoal>install</defaultGoal>
- 
--        <plugins>
--            <plugin>
--                 <groupId>org.apache.maven.plugins</groupId>
--                 <artifactId>maven-checkstyle-plugin</artifactId>
--            </plugin>
--            <plugin>
--                 <groupId>org.apache.maven.plugins</groupId>
--                 <artifactId>maven-pmd-plugin</artifactId>
--            </plugin>
--        </plugins>
-         <pluginManagement>
-             <plugins>
-                 <plugin>
diff --git a/cxf-xjc-utils.spec b/cxf-xjc-utils.spec
index f11439b..3af909c 100644
--- a/cxf-xjc-utils.spec
+++ b/cxf-xjc-utils.spec
@@ -1,20 +1,19 @@
 Name:             cxf-xjc-utils
-Version:          2.6.0
-Release:          8%{?dist}
+Version:          2.6.2
+Release:          1%{?dist}
 Summary:          Apache CXF XJC-Utils
 Group:            Development/Libraries
 License:          ASL 2.0
 URL:              http://cxf.apache.org/xjc-utils.html
 
-# svn export http://svn.apache.org/repos/asf/cxf/xjc-utils/tags/xjc-utils-2.6.0/ cxf-xjc-utils-2.6.0
-# tar cafJ cxf-xjc-utils-2.6.0.tar.xz cxf-xjc-utils-2.6.0
+# svn export http://svn.apache.org/repos/asf/cxf/xjc-utils/tags/xjc-utils-2.6.2/ cxf-xjc-utils-2.6.2
+# tar cafJ cxf-xjc-utils-2.6.2.tar.xz cxf-xjc-utils-2.6.2
 
-Source0:          %{name}-%{version}.tar.xz
-
-Patch0:           %{name}-%{version}-pom.patch
+Source0:          cxf-xjc-utils-%{version}.tar.xz
 
 BuildArch:        noarch
 
+BuildRequires:    cxf-build-utils
 BuildRequires:    jpackage-utils
 BuildRequires:    java-devel
 BuildRequires:    maven-local
@@ -23,6 +22,7 @@ BuildRequires:    maven-install-plugin
 BuildRequires:    maven-jar-plugin
 BuildRequires:    maven-javadoc-plugin
 BuildRequires:    maven-shade-plugin
+BuildRequires:    maven-checkstyle-plugin
 BuildRequires:    apache-commons-lang
 BuildRequires:    glassfish-jaxb
 BuildRequires:    glassfish-jaxb-api
@@ -30,18 +30,10 @@ BuildRequires:    junit
 BuildRequires:    jvnet-parent
 BuildRequires:    maven-project
 BuildRequires:    maven-shared-downloader
-BuildRequires:    maven-surefire-provider-junit4
+BuildRequires:    maven-surefire-provider-junit
 BuildRequires:    ws-jaxme
 BuildRequires:    wsdl4j
 
-Requires:         jpackage-utils
-Requires:         java-headless
-Requires:         apache-commons-lang
-Requires:         glassfish-jaxb
-Requires:         junit
-Requires:         ws-jaxme
-Requires:         wsdl4j
-
 %description
 The Apache CXF XJC-Utils provides a bunch of utilities for working
 with JAXB to generate better or more usable code.
@@ -57,52 +49,25 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -n %{name}-%{version}
 
-%patch0 -p1
+%pom_remove_plugin org.apache.maven.plugins:maven-pmd-plugin
+%pom_disable_module bug671
 
 %build
-# test fail because of missing dependencies
-mvn-rpmbuild \
-    -Dmaven.test.skip=true \
-    -Dproject.build.sourceEncoding=UTF-8 \
-    package javadoc:aggregate
-
+%mvn_build -f
 
 %install
-install -d -m 755 %{buildroot}%{_javadir}/%{name}
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-
-for module in boolean bug671 cxf-xjc-plugin dv \
-              property-listener runtime ts wsdlextension;
-do
-    pushd $module
+%mvn_install
 
-    case $module in
-    cxf-xjc-plugin)    module=plugin ;;
-    property-listener) module=pl ;;
-    esac
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 
-    install -pm 644 target/cxf-xjc-$module-%{version}.jar %{buildroot}%{_javadir}/%{name}/cxf-xjc-$module.jar
-    install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-cxf-xjc-$module.pom
-    %add_maven_depmap JPP.%{name}-cxf-xjc-$module.pom %{name}/cxf-xjc-$module.jar
-    popd
-done
-
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}.pom
-%add_maven_depmap JPP.%{name}.pom
-
-# javadoc
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 
 %changelog
+* Tue Mar 24 2015 Marek Goldmann <mgoldman@redhat.com> - 2.6.2-1
+- Upstream release 2.6.2
+- Switch to xmvn
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 3aa3f35..2243dc0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b51370d33f601a82df61e9de4b359a14  cxf-xjc-utils-2.6.0.tar.xz
+c7c460415fa315165561b4cd03f97159  cxf-xjc-utils-2.6.2.tar.xz