diff --git a/rhino.changes b/rhino.changes
index fd12cc7..17d518a 100644
--- a/rhino.changes
+++ b/rhino.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Sep 15 05:49:47 UTC 2017 - fstrba@suse.com
+
+- Make build with the new version of java-1_5_0-gcj-compat, where
+  javac is not just a simple link to gcj, but a wrapper script that
+  runs Eclipse Compiler for Java(tm)
+- Make buildable with different versions of OpenJDK
+
 -------------------------------------------------------------------
 Fri Jun  9 09:59:36 UTC 2017 - tchvatal@suse.com
 
diff --git a/rhino.spec b/rhino.spec
index ddb0b43..0a9540e 100644
--- a/rhino.spec
+++ b/rhino.spec
@@ -22,7 +22,7 @@ Name:           rhino
 Version:        1.7R3
 Release:        0
 Summary:        JavaScript for Java
-License:        MPL-1.1 or GPL-2.0+
+License:        MPL-1.1 OR GPL-2.0+
 Group:          Development/Libraries/Java
 Url:            http://www.mozilla.org/rhino/
 # wget ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino%{cvs_version}.zip
@@ -51,20 +51,31 @@ BuildRequires:  bea-stax-api
 BuildRequires:  java-1_5_0-gcj-compat-devel
 BuildRequires:  javapackages-tools
 BuildRequires:  jline
+BuildRequires:  xmlbeans-mini
+#!BuildIgnore:  antlr
+#!BuildIgnore:  antlr-java
+#!BuildIgnore:  java-1_6_0-openjdk
+#!BuildIgnore:  java-1_6_0-openjdk-devel
+#!BuildIgnore:  java-1_6_0-openjdk-headless
+#!BuildIgnore:  java-1_7_0-openjdk
+#!BuildIgnore:  java-1_7_0-openjdk-devel
+#!BuildIgnore:  java-1_7_0-openjdk-headless
+#!BuildIgnore:  java-1_8_0-openjdk
+#!BuildIgnore:  java-1_8_0-openjdk-devel
+#!BuildIgnore:  java-1_8_0-openjdk-headless
+#!BuildIgnore:  java-9-openjdk
+#!BuildIgnore:  java-9-openjdk-devel
+#!BuildIgnore:  java-9-openjdk-headless
+#!BuildIgnore:  xerces-j2
 #BuildRequires:  xerces-j2-bootstrap
 #!BuildIgnore:  xerces-j2-bootstrap
-BuildRequires:  xmlbeans-mini
-#!BuildIgnore:  xerces-j2 xml-commons xml-commons-apis xml-commons-resolver
-#!BuildIgnore:  antlr antlr-java
+#!BuildIgnore:  xml-commons
+#!BuildIgnore:  xml-commons-apis
 #!BuildIgnore:  xml-commons-jaxp-1.3-apis
-#!BuildIgnore:  java-1_6_0-openjdk java-1_6_0-openjdk-devel java-1_6_0-openjdk-headless
-#!BuildIgnore:  java-1_7_0-openjdk java-1_7_0-openjdk-devel java-1_7_0-openjdk-headless
-#!BuildIgnore:  java-1_8_0-openjdk java-1_8_0-openjdk-devel java-1_8_0-openjdk-headless
-#!BuildIgnore:  java-9-openjdk java-9-openjdk-devel java-9-openjdk-headless
+#!BuildIgnore:  xml-commons-resolver
 Requires:       bea-stax-api
 Requires:       jline
 Requires:       xmlbeans
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
 %description
@@ -110,9 +121,10 @@ export OPT_JAR_LIST=:
     -Djsr173.jar=$(build-classpath bea-stax-api) \
     deepclean jar copy-all
 
+export CLASSPATH=`pwd`/build/%{name}%{cvs_version}/js.jar:$(build-classpath xmlbeans/xbean 2>/dev/null)
+SOURCEPATH=`pwd`/build/%{name}%{cvs_version}/src
 pushd examples
-export CLASSPATH=../build/%{name}%{cvs_version}/js.jar:$(build-classpath xmlbeans/xbean 2>/dev/null)
-javac -C *.java
+javac -sourcepath ${SOURCEPATH} -source 1.5 -target 1.5 *.java
 jar cvf ../build/%{name}%{cvs_version}/%{name}-examples.jar *.class
 popd
 
@@ -136,7 +148,6 @@ cp -a examples/* %{buildroot}%{_datadir}/%{name}
 cp -a build/%{name}%{cvs_version}/%{name}-examples.jar %{buildroot}%{_javadir}/%{name}-examples.jar
 
 %files
-%defattr(0644,root,root,0755)
 %doc LICENSE.txt
 %attr(0755,root,root) %{_bindir}/%{name}
 %attr(0755,root,root) %{_bindir}/%{name}-debugger
@@ -145,7 +156,6 @@ cp -a build/%{name}%{cvs_version}/%{name}-examples.jar %{buildroot}%{_javadir}/%
 %{_javadir}/*.jar
 
 %files demo
-%defattr(0644,root,root,0755)
 %{_datadir}/%{name}
 
 %changelog