diff --git a/subversion.spec b/subversion.spec
index d400e6f..1933a04 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -1,7 +1,11 @@
 # set to zero to avoid running test suite
 %define make_check 1
 
-%define with_java 1
+%ifarch %{power64}
+%global with_java 0
+%else
+%global with_java 1
+%endif
 %define with_kwallet 1
 
 # set JDK path to build javahl; default for JPackage
@@ -150,6 +154,7 @@ BuildRequires: java-devel-openjdk
 BuildRequires: zip, unzip
 # For the tests
 BuildRequires: junit
+BuildArch: noarch
 
 %description javahl
 This package includes the JNI bindings to the Subversion libraries.
@@ -437,9 +442,6 @@ make check-javahl
 %{_libdir}/libsvn*.so
 %{_datadir}/pkgconfig/*.pc
 %exclude %{_libdir}/libsvn_swig_perl*
-%if %{with_java}
-%exclude %{_libdir}/libsvnjavahl-1.*
-%endif
 
 %files -n mod_dav_svn
 %config(noreplace) %{_httpd_modconfdir}/*.conf
@@ -460,7 +462,6 @@ make check-javahl
 
 %if %{with_java}
 %files javahl
-%{_libdir}/libsvnjavahl-1.*
 %{_javadir}/svn-javahl.jar
 %endif
 
@@ -468,6 +469,7 @@ make check-javahl
 * Thu Jul  6 2017 Joe Orton <jorton@redhat.com> - 1.9.6-1
 - update to 1.9.6 (#1467890)
 - update to latest upstream psvn.el
+- move libsvnjavahl to -libs, build -javahl noarch
 
 * Sun Jun 04 2017 Jitka Plesnikova <jplesnik@redhat.com> - 1.9.5-4
 - Perl 5.26 rebuild