diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index f58dee0..8e68eca 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -31,7 +31,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           %{?scl_prefix}eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        0.2.git20140506%{?dist}
+Release:        0.3.git20140506%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -242,22 +242,16 @@ pushd core/org.eclipse.cdt.core.linux/library
 make JAVA_HOME="%{java_home}" ARCH=%{eclipse_arch} CC='gcc -D_GNU_SOURCE'
 popd
 
-mvn-rpmbuild -o -Dmaven.test.skip=true -Dtycho.local.keepTarget -fae clean install
+xmvn -o -Dtycho.local.keepTarget -Dmaven.test.skip=true install
 
 ## Libhover has dependencies on CDT so we must add these to the SDK directory
 unzip -o releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo.zip -d $SDK
+xmvn -o -Dmaven.test.skip=true verify -f ../%{linuxtools_snapshot}/pom.xml
 popd
 
 ## Libhover build
 pushd %{linuxtools_snapshot}
 
-mkdir -p .m2/p2/repo-sdk/features
-mkdir -p .m2/p2/repo-sdk/plugins
-cp -d  $SDK/features/*.jar .m2/p2/repo-sdk/features
-cp -d $SDK/plugins/*.jar .m2/p2/repo-sdk/plugins
-cp -r %{_javadir}/neko*.jar .m2/p2/repo-sdk/plugins/
-
-mvn-rpmbuild -DskipTychoVersionCheck -Dmaven.test.skip=true -fae clean install
 
 pushd releng/org.eclipse.linuxtools.releng-site/target/repository/features
 for f in `ls -1 . | grep jar$`; do
@@ -388,6 +382,9 @@ rm -rf $installDir/eclipse/binary
 %doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
 
 %changelog
+* Thu May 22 2014 Alexander Kurtakov <akurtako@redhat.com> 1:8.4.0-0.3.git20140506
+- Use xmvn to build.
+
 * Thu May 15 2014 Jeff Johnston <jjohnstn@redhat.com> 1:8.4.0-0.2.git20140506
 - Remove org.apache.xerces and org.cyberneko.html plugins from installation
   and link to jars from Fedora packages