diff --git a/bouncycastle.changes b/bouncycastle.changes
index 809c3cd..753df89 100644
--- a/bouncycastle.changes
+++ b/bouncycastle.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 15 17:44:49 UTC 2018 - fstrba@suse.com
+
+- Build with source and target 8 to prepare for a possible removal
+  of 1.6 compatibility in OpenJDK 11
+
 -------------------------------------------------------------------
 Fri Sep 15 07:25:45 UTC 2017 - fstrba@suse.com
 
diff --git a/bouncycastle.spec b/bouncycastle.spec
index 972cafd..cbf5a58 100644
--- a/bouncycastle.spec
+++ b/bouncycastle.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package bouncycastle
 #
-# 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
@@ -30,7 +30,7 @@ Url:            http://www.bouncycastle.org/
 Source0:        http://www.bouncycastle.org/download/bcprov-%{archivever}.tar.gz
 Source1:        http://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/%{ver}/bcprov-jdk15on-%{ver}.pom
 Patch0:         ambiguous-reseed.patch
-BuildRequires:  java-devel >= 1.6
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
 BuildRequires:  junit
@@ -71,7 +71,7 @@ unzip -qq src.zip -d src/
 %build
 pushd src
   export CLASSPATH=$(build-classpath junit)
-  %javac -g -source 1.6 -target 1.6 -encoding UTF-8 $(find . -type f -name "*.java")
+  %javac -g -source 8 -target 8 -encoding UTF-8 $(find . -type f -name "*.java")
   jarfile="../bcprov-%{version}.jar"
   # Exclude all */test/* files except org.bouncycastle.util.test, cf. upstream
   files="$(find . -type f \( -name '*.class' -o -name '*.properties' \) -not -path '*/test/*')"