diff --git a/aelfred.changes b/aelfred.changes
index faa8b6d..fcaa633 100644
--- a/aelfred.changes
+++ b/aelfred.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 15 05:00:18 UTC 2018 - fstrba@suse.com
+
+- Build with source and target 8 to prepare for a possible removal
+  of 1.6 compatibility in OpenJDK 11
+
 -------------------------------------------------------------------
 Wed Jan 10 03:57:04 UTC 2018 - bwiedemann@suse.com
 
diff --git a/aelfred.spec b/aelfred.spec
index 18f8117..e1b0312 100644
--- a/aelfred.spec
+++ b/aelfred.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package aelfred
 #
-# 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
@@ -17,18 +17,18 @@
 
 
 Name:           aelfred
-Version:        7.0 
+Version:        7.0
 Release:        0
 Summary:        Java-based XML parser
 License:        BSD-3-Clause
 Group:          Development/Libraries/Java
-Url:            http://saxon.sourceforge.net/aelfred.html
-Source0:        http://downloads.sourceforge.net/project/saxon/aelfred/7.0/aelfred7_0.zip 
+URL:            http://saxon.sourceforge.net/aelfred.html
+Source0:        http://downloads.sourceforge.net/project/saxon/aelfred/7.0/aelfred7_0.zip
 Patch0:         aelfred-icedtea-build.patch
 BuildRequires:  ant
+BuildRequires:  java-devel >= 1.7
 BuildRequires:  javapackages-tools
 BuildRequires:  unzip
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
 %description
@@ -54,20 +54,20 @@ Demonstrations and samples for aelfred.
 %prep
 %setup -q -c
 unzip %{name}-source.zip
-%patch0 -p0 
+%patch0
 
 %build
 export JAVA_HOME=%{java_home}
 export PATH=%{java_home}/bin:$PATH
 export CLASSPATH=
-cd net 
-%{javac} -source 1.6 `find . -name \*.java`
-%{javadoc} -notimestamp -source 1.6 -d ../HTML `find . -name \*.java`
+cd net
+%{javac} -source 8 -target 8 `find . -name \*.java`
+%{javadoc} -notimestamp -source 8 -d ../HTML `find . -name \*.java`
 
 %install
 # jar
 export JAVA_HOME=%{java_home}
-cd net 
+cd net
 mkdir -p %{buildroot}%{_javadir}
 cp -a ../saxon-%{name}.jar \
 %{buildroot}%{_javadir}/%{name}-%{version}.jar