diff --git a/bea-stax-target15.patch b/bea-stax-target16.patch
similarity index 76%
rename from bea-stax-target15.patch
rename to bea-stax-target16.patch
index 6f02e33..72edad8 100644
--- a/bea-stax-target15.patch
+++ b/bea-stax-target16.patch
@@ -5,25 +5,28 @@
      <!--unjar src="${jar_api}" dest="${class_dir}"/-->
      <javac srcdir="${src_api}"
 -      source="1.2" target="1.2"
-+      source="1.5" target="1.5"
++      source="1.6" target="1.6"
        includes="${api_dirs}"
        destdir="${class_dir}"
        debug="true">
-@@ -104,7 +104,7 @@
+@@ -104,9 +104,10 @@
    <target name="compile" depends="init,api">
      <!--javac srcdir="${src}:${api_src_dir}"-->
      <javac srcdir="${src}"
 -      source="1.2" target="1.2"
-+      source="1.5" target="1.5"
++      source="1.6" target="1.6"
        includes="${topdirs}"
        destdir="${class_dir}"
++      encoding="ISO-8859-1"
        debug="true">
-@@ -124,7 +124,7 @@
+       <classpath>
+         <pathelement path="${java.class.path}"/>
+@@ -124,7 +125,7 @@
    </target>
    <target name="test_compile" depends="api, test_init">
      <javac srcdir="${src}" includes="org/codehaus/stax/test/**/*.java"
 -      source="1.2" target="1.2"
-+      source="1.5" target="1.5"
++      source="1.6" target="1.6"
        destdir="${test_class_dir}"
        debug="true">
        <classpath>
diff --git a/bea-stax.changes b/bea-stax.changes
index 18caba1..e7957ad 100644
--- a/bea-stax.changes
+++ b/bea-stax.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Sep 14 16:17:04 UTC 2017 - fstrba@suse.com
+
+- Don't require java-1_5_0-gcj-compat and build with source and
+  target level 1.6
+- Removed patch:
+  * bea-stax-target15.patch
+- Added patch:
+  * bea-stax-target16.patch
+    - change the source and target levels and fix a problem with
+      the encoding of one file
+
 -------------------------------------------------------------------
 Sun May 21 08:15:12 UTC 2017 - tchvatal@suse.com
 
diff --git a/bea-stax.spec b/bea-stax.spec
index da596fd..e9c5c8e 100644
--- a/bea-stax.spec
+++ b/bea-stax.spec
@@ -25,10 +25,10 @@ License:        Apache-2.0
 Group:          Development/Libraries/Java
 Url:            http://dev2dev.bea.com/technologies/stax/index.jsp
 Source0:        stax-src-1.2.0_rc1-dev.zip
-Patch0:         bea-stax-target15.patch
+Patch0:         bea-stax-target16.patch
 Patch2:         bea-stax-gcj-build.patch
 BuildRequires:  ant
-BuildRequires:  java-1_5_0-gcj-compat-devel
+BuildRequires:  java-devel >= 1.6
 BuildRequires:  javapackages-tools
 BuildRequires:  unzip
 #!BuildIgnore:  xerces-j2-bootstrap