diff --git a/nqp.spec b/nqp.spec
index 85d564e..bf34ff3 100644
--- a/nqp.spec
+++ b/nqp.spec
@@ -1,16 +1,4 @@
-#
-# noarch:	moar,jvm
-#
-
-#
-# disables the check: brp-java-repack-jars
-# needed that the following error do not happen at the 'rakudo' build
-# also the the command 'nqp-j --version' fails with that error:
-#  Unhandled exception: java.lang.RuntimeException: Bytecode jar contains
-#  unexpected file META-INF/
-#     in  (src/stage2/gen/NQP.nqp)
-#
-%define __jar_repack %{nil}
+%define debug_package %{nil}
 
 
 %global year 2017
@@ -19,12 +7,9 @@
 
 Name:		nqp
 Version:	0.0.%{year}.%{month}
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Not Quite Perl (6)
 
-BuildArch:	noarch
-
-Group:		Development/Libraries
 License:	Artistic 2.0 and ISC and WTFPL
 URL:		https://github.com/perl6/nqp
 Source0:	http://rakudo.org/downloads/nqp/nqp-%{year}.%{month}.tar.gz
@@ -49,30 +34,6 @@ a Perl 6 object model and regular expression engine for the virtual machine.
 
 #--
 
-%package jvm
-Summary:	Not Quite Perl (6) build on JVM
-Group:		Development/Libraries
-
-BuildArch:	noarch
-
-BuildRequires:	perl(Text::ParseWords)
-BuildRequires:	perl(Test::Harness)
-
-BuildRequires:	jpackage-utils
-BuildRequires:	java
-BuildRequires:	java-devel
-
-#BuildRequires:	jna
-
-Requires:	java
-#Requires:	jna
-
-
-%description jvm
-Not Quite Perl (6) build on JVM
-
-#--
-
 %package doc
 Summary:	Documentation for Not Quite Perl (6)
 Group:		Documentation
@@ -91,8 +52,6 @@ Documentation and also examples about NQP.
 
 
 %build
-# needed to build on arm
-sed -i -e "s/= java$/= java -Xmx2048m/" tools/build/Makefile-JVM.in
 
 #rm -r 3rdparty/jna	# make sure not to bundle 'jna'
 # src/vm/jvm/runners/nqp-j.bat	this file is only for windows
@@ -111,13 +70,7 @@ find examples -maxdepth 1 -name "*.nqp" \
 # correct file mode bits to prevent rpmlint warning
 %{__chmod} 644 docs/ops.markdown
 
-%{__perl} Configure.pl --backends=moar,jvm --prefix=%{_usr}
-#   --with-jna=%%{_javadir}/jna.jar
-# There are different places for the libjnidispatch.so library for the 
-# i686 and x86_64 architecture 
-# /usr/lib/jna/libjnidispatch.so      for i686
-# /usr/lib64/jna/libjnidispatch.so    for x86_64
-# so the --with-jna option could not be used
+%{__perl} Configure.pl --backends=moar --prefix=%{_usr} --libdir=%{_libdir}
 CFLAGS="$RPM_OPT_FLAGS -fPIC" %{__make} %{?_smp_mflags}
 
 
@@ -129,32 +82,18 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC" %{__make} %{?_smp_mflags}
 # fails at prove -r --exec "./nqp-m" ...
 rm -f t/hll/06-sprintf.t
 rm -f t/nqp/060-bigint.t
-# jvm
-rm -f t/nativecall/01-basic.t
-#rm -f t/nqp/76-capture.t
-%ifarch ppc
-rm -f t/nqp/059-nqpop.t	# fails on ppc
+%ifarch ppc64
+rm -f t/nqp/059-nqpop.t
 %endif
 %{?!_without_tests: make test}
 
 
 %files
-%doc CREDITS LICENSE README.pod
+%doc CREDITS README.pod
+%license LICENSE
 %{_bindir}/nqp
 %{_bindir}/nqp-m
-%dir %{_datadir}/nqp
-%dir %{_datadir}/nqp/lib
-%{_datadir}/nqp/lib/*.moarvm
-%{_datadir}/nqp/lib/profiler/template.html
-
-
-%files jvm
-%{_bindir}/nqp-j
-%{_bindir}/eval-client.pl
-%dir %{_datadir}/nqp
-%dir %{_datadir}/nqp/lib
-%{_datadir}/nqp/lib/*.jar
-%{_datadir}/nqp/runtime
+%{_libdir}/nqp
 
 
 %files doc
@@ -162,6 +101,13 @@ rm -f t/nqp/059-nqpop.t	# fails on ppc
 
 
 %changelog
+* Wed Feb 01 2017 Gerd Pokorra <gp@zimt.uni-siegen.de> 0.0.2017.01-2
+- remove jvm subpackage
+- build architecture dependent
+- add libdir configuration option
+- add license macro
+- disable debug package
+
 * Wed Feb 01 2017 Gerd Pokorra <gp@zimt.uni-siegen.de> 0.0.2017.01-1
 - update to 2017.01