diff --git a/adaptx.changes b/adaptx.changes
index ea29aa6..2188ff5 100644
--- a/adaptx.changes
+++ b/adaptx.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 15 04:51:19 UTC 2018 - fstrba@suse.com
+
+- Build with source and target 8 to prepare for a possible removal
+  of 1.6 compatibility in OpenJDK 11
+
 -------------------------------------------------------------------
 Thu Sep 14 11:15:20 UTC 2017 - fstrba@suse.com
 
diff --git a/adaptx.spec b/adaptx.spec
index 0382964..1c17e30 100644
--- a/adaptx.spec
+++ b/adaptx.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package adaptx
 #
-# 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
@@ -22,12 +22,13 @@ Release:        0
 Summary:        XSLT Processor Written in Java
 License:        BSD-3-Clause
 Group:          Development/Libraries/Java
-Url:            http://castor.exolab.org/
+URL:            http://castor.exolab.org/
 Source0:        %{name}-%{version}-src.tar.bz2
 # svn export http://svn.codehaus.org/castor/adaptx
 Patch0:         %{name}-%{version}-xsl.patch
 Patch1:         %{name}-%{version}-icedtea-build.patch
 BuildRequires:  ant >= 1.6
+BuildRequires:  java-devel >= 1.7
 BuildRequires:  javapackages-tools
 BuildRequires:  log4j
 BuildRequires:  xerces-j2
@@ -36,7 +37,6 @@ BuildRequires:  xml-commons-apis
 Requires:       log4j
 Requires:       xerces-j2
 Requires:       xml-commons-apis
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
 %description
@@ -70,9 +70,9 @@ done
 %build
 perl -p -i -e 's|classic|modern|' src/build.xml
 export CLASSPATH=$(build-classpath xml-commons-apis log4j xerces-j2 xerces-j2-xml-apis)
-ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 -buildfile src/build.xml jar javadoc
+ant -Dant.build.javac.source=8 -Dant.build.javac.target=8 -buildfile src/build.xml jar javadoc
 CLASSPATH=$CLASSPATH:dist/adaptx_%{version}.jar
-ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 -buildfile src/build.xml doc
+ant -Dant.build.javac.source=8 -Dant.build.javac.target=8 -buildfile src/build.xml doc
 
 %install
 # jar