diff --git a/dom4j-sourcetarget.patch b/dom4j-sourcetarget.patch
index 51c8eb2..1644b75 100644
--- a/dom4j-sourcetarget.patch
+++ b/dom4j-sourcetarget.patch
@@ -6,8 +6,8 @@
             optimize="${optimize}"
 -           target="1.3"
 -           source="1.3"
-+           target="1.6"
-+           source="1.6"
++           target="8"
++           source="8"
             deprecation="${deprecation}"
             classpathref="compile.classpath">
  	<exclude name="org/dom4j/datatype/**"/>
@@ -15,7 +15,7 @@
      <mkdir dir="${build.javadocs}"/>
      <javadoc packagenames="${packages}"
               sourcepath="${build.src}"
-+             source="1.6"
++             source="8"
               destdir="${build.javadocs}"
               author="true"
               version="true"
@@ -23,7 +23,7 @@
      <mkdir dir="${build.javadocs}"/>
      <javadoc packagenames="${packages}"
               sourcepath="${build.src}"
-+             source="1.6"
++             source="8"
               destdir="${build.javadocs}"
               author="true"
               version="true"
@@ -31,7 +31,7 @@
      <mkdir dir="${build.apidocs}"/>
      <javadoc packagenames="${api.packages}"
               sourcepath="${build.src}"
-+             source="1.6"
++             source="8"
               destdir="${build.apidocs}"
               author="true"
               version="true"
diff --git a/dom4j.changes b/dom4j.changes
index f7df0cb..526438e 100644
--- a/dom4j.changes
+++ b/dom4j.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed May 16 11:56:27 UTC 2018 - fstrba@suse.com
+
+- Modified patch:
+  * dom4j-sourcetarget.patch
+    + Build with source and target 8 to prepare for a possible
+      removal of 1.6 compatibility in OpenJDK 11
+
 -------------------------------------------------------------------
 Fri Sep  8 05:47:14 UTC 2017 - fstrba@suse.com
 
diff --git a/dom4j.spec b/dom4j.spec
index 7c87f30..78c3746 100644
--- a/dom4j.spec
+++ b/dom4j.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dom4j
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed