diff --git a/bea-stax-gcj43-build.patch b/bea-stax-gcj43-build.patch
new file mode 100644
index 0000000..8d2e6da
--- /dev/null
+++ b/bea-stax-gcj43-build.patch
@@ -0,0 +1,11 @@
+--- src/com/bea/xml/stream/AttributeBase.java
++++ src/com/bea/xml/stream/AttributeBase.java
+@@ -86,7 +86,7 @@
+   public boolean isNamespaceDeclaration() { return false; }
+   public String getLocalName() { return name.getLocalPart(); }
+   public String getValue() { return value; }
+-  public String getDTDType() { return "CDATA"; }
++  public javax.xml.namespace.QName getDTDType() { return new javax.xml.namespace.QName("CDATA"); }
+   public String getNamespaceURI() { return name.getNamespaceURI();}
+   public void setNamespaceURI(String uri) { name = new QName(uri,name.getLocalPart()); }
+ 
diff --git a/bea-stax.changes b/bea-stax.changes
index e1d27c7..d655b09 100644
--- a/bea-stax.changes
+++ b/bea-stax.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Thu Jan  5 15:31:59 UTC 2017 - tchvatal@suse.com
-
-- Use java-devel and not gcj as it is getting deprecated
-- Drop unused patch bea-stax-gcj43-build.patch
-
 -------------------------------------------------------------------
 Mon Sep  9 11:05:33 UTC 2013 - tchvatal@suse.com
 
diff --git a/bea-stax.spec b/bea-stax.spec
index c0c6fbd..b6e072c 100644
--- a/bea-stax.spec
+++ b/bea-stax.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package bea-stax
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,7 @@ 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
+Patch1:         bea-stax-gcj43-build.patch
 Patch2:         bea-stax-gcj-build.patch
 
 Name:           bea-stax
@@ -35,7 +36,7 @@ BuildArch:      noarch
 BuildRequires:  javapackages-tools
 %if %defined suse_version
 BuildRequires:  ant
-BuildRequires:  java-devel
+BuildRequires:  java-1_5_0-gcj-compat-devel
 BuildRequires:  unzip
 #BuildRequires:  xerces-j2-bootstrap
 #!BuildIgnore:  xerces-j2-bootstrap
@@ -70,6 +71,9 @@ Streaming API for XML
 %prep
 %setup -q -c -n %{name}-%{version}
 %patch0 -b .target15
+%if %suse_version <= 1110
+%patch1 -b .gcj43-build
+%endif
 %patch2 -b .gcj-build
 
 %build