diff --git a/jnr-ffi-remove-dependency-versions-not-understood-by-fedora-maven.patch b/jnr-ffi-remove-dependency-versions-not-understood-by-fedora-maven.patch
deleted file mode 100644
index b2e45bf..0000000
--- a/jnr-ffi-remove-dependency-versions-not-understood-by-fedora-maven.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- pom.xml.orig	2012-08-05 04:03:31.000000000 +0200
-+++ pom.xml	2012-09-05 12:11:37.873810410 +0200
-@@ -47,56 +47,47 @@
-     <dependency>
-       <groupId>junit</groupId>
-       <artifactId>junit</artifactId>
--      <version>[4.5.0,5.0.0)</version>
-       <scope>test</scope>
-     </dependency>
-     <dependency>
-       <groupId>com.github.jnr</groupId>
-       <artifactId>jffi</artifactId>
--      <version>[1.2.1, 1.3.0)</version>
-       <scope>compile</scope>
-     </dependency>
-     <dependency>
-       <groupId>com.github.jnr</groupId>
-       <artifactId>jffi</artifactId>
--      <version>[1.2.1, 1.3.0)</version>
-       <scope>runtime</scope>
-       <classifier>native</classifier>
-     </dependency>
-     <dependency>
-       <groupId>org.ow2.asm</groupId>
-       <artifactId>asm</artifactId>
--      <version>4.0</version>
-       <scope>compile</scope>
-     </dependency>
-     <dependency>
-       <groupId>org.ow2.asm</groupId>
-       <artifactId>asm-commons</artifactId>
--      <version>4.0</version>
-       <scope>compile</scope>
-     </dependency>
-     <dependency>
-       <groupId>org.ow2.asm</groupId>
-       <artifactId>asm-analysis</artifactId>
--      <version>4.0</version>
-       <scope>compile</scope>
-     </dependency>
-     <dependency>
-       <groupId>org.ow2.asm</groupId>
-       <artifactId>asm-tree</artifactId>
--      <version>4.0</version>
-       <scope>compile</scope>
-     </dependency>
-     <dependency>
-       <groupId>org.ow2.asm</groupId>
-       <artifactId>asm-util</artifactId>
--      <version>4.0</version>
-       <scope>compile</scope>
-     </dependency>
-     <dependency>
-       <groupId>com.github.jnr</groupId>
-       <artifactId>jnr-x86asm</artifactId>
--      <version>[1.0.2,)</version>
-       <scope>compile</scope>
-     </dependency>
-   </dependencies>
diff --git a/jnr-ffi.spec b/jnr-ffi.spec
index 1b863c3..c4994c8 100644
--- a/jnr-ffi.spec
+++ b/jnr-ffi.spec
@@ -3,35 +3,25 @@
 
 Name:     jnr-ffi
 Version:  0.7.10
-Release:  3%{?dist}
+Release:  4%{?dist}
 Summary:  Java Abstracted Foreign Function Layer
-Group:    System Environment/Libraries
 License:  ASL 2.0
 URL:      http://github.com/jnr/%{name}/
 Source0:  https://github.com/jnr/%{name}/tarball/%{version}/jnr-%{name}-%{version}-0-g%{commit_hash}.tar.gz
 
-Patch1:   %{name}-remove-dependency-versions-not-understood-by-fedora-maven.patch
-
-BuildRequires: java-devel
-BuildRequires: jpackage-utils
-BuildRequires: jffi
-BuildRequires: jnr-x86asm
-BuildRequires: junit
-BuildRequires: objectweb-asm4
-
 BuildRequires:  maven-local
-BuildRequires:  maven-clean-plugin
-BuildRequires:  maven-compiler-plugin
-BuildRequires:  maven-dependency-plugin
-BuildRequires:  maven-install-plugin
-BuildRequires:  maven-jar-plugin
-BuildRequires:  maven-javadoc-plugin
-
-Requires:      java
-Requires:      jpackage-utils
-Requires:      jffi
-Requires:      jnr-x86asm
-Requires:      objectweb-asm4
+BuildRequires:  mvn(com.github.jnr:jffi)
+BuildRequires:  mvn(com.github.jnr:jnr-x86asm)
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-release-plugin)
+BuildRequires:  mvn(org.ow2.asm:asm)
+BuildRequires:  mvn(org.ow2.asm:asm-analysis)
+BuildRequires:  mvn(org.ow2.asm:asm-commons)
+BuildRequires:  mvn(org.ow2.asm:asm-tree)
+BuildRequires:  mvn(org.ow2.asm:asm-util)
+BuildRequires:  mvn(org.sonatype.oss:oss-parent)
+
 
 BuildArch:     noarch
 
@@ -42,49 +32,44 @@ An abstracted interface to invoking native functions from java
 
 %package javadoc
 Summary:        Javadocs for %{name}
-Group:          Documentation
-Requires:       jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
 
 %prep
 %setup -q -n jnr-%{name}-%{tag_hash}
-%patch1 -p0
+
+# artifact com.github.jnr:jffi::native: is not available in Fedora
+%pom_xpath_remove "pom:dependency[pom:artifactId[text()='jffi'] and pom:classifier[text()='native']]"
 
 # remove all builtin jars
 find -name '*.jar' -o -name '*.class' -exec rm -f '{}' \;
 
-%build
 # don't fail on unused parameters... (TODO: send patch upstream)
 sed -i 's|-Werror||' libtest/GNUmakefile
-# TODO: tests still fail, investigate
-mvn-rpmbuild install javadoc:aggregate -DskipTests
 
-%install
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%mvn_file :{*} %{name}/@1 @1
 
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml  \
-        $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%build
+%mvn_build
 
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%install
+%mvn_install
 
-%files
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 %doc LICENSE
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE
-%{_javadocdir}/%{name}
 
 %changelog
+* Wed Sep 25 2013 Michal Srb <msrb@redhat.com> - 0.7.10-4
+- Adapt to current guidelines
+- Remove unneeded patch
+- Enable tests
+- Fix BR
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild