diff --git a/cglib.changes b/cglib.changes
index 5dc47ed..1ed61b3 100644
--- a/cglib.changes
+++ b/cglib.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 16 09:07:44 UTC 2018 - fstrba@suse.com
+
+- Build with source and target 8 to prepare for a possible removal
+  of 1.6 compatibility in OpenJDK 11
+
 -------------------------------------------------------------------
 Mon Sep 18 06:30:45 UTC 2017 - fstrba@suse.com
 
diff --git a/cglib.spec b/cglib.spec
index c0922c1..6849fbc 100644
--- a/cglib.spec
+++ b/cglib.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cglib
 #
-# 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
@@ -29,7 +29,7 @@ Source1:        /%{name}-%{version}.pom
 Patch0:         %{name}-build_xml.patch
 BuildRequires:  ant >= 1.6
 BuildRequires:  fdupes
-BuildRequires:  java-devel >= 1.6.0
+BuildRequires:  java-devel >= 1.8
 # Needed for maven conversions
 BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
@@ -62,7 +62,7 @@ build-jar-repository -s -p lib objectweb-asm ant
 
 %build
 ant \
-    -Dcompile.target=1.6 -Dcompile.source=1.6 \
+    -Dcompile.target=8 -Dcompile.source=8 \
     jar javadoc
 
 %install