diff --git a/antlr-bootstrap.changes b/antlr-bootstrap.changes
index ab9b098..679eb87 100644
--- a/antlr-bootstrap.changes
+++ b/antlr-bootstrap.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 15 05:55:58 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 Dec  7 11:38:17 UTC 2017 - dimstar@opensuse.org
 
diff --git a/antlr-bootstrap.spec b/antlr-bootstrap.spec
index 65831fe..8722776 100644
--- a/antlr-bootstrap.spec
+++ b/antlr-bootstrap.spec
@@ -27,7 +27,7 @@ Group:          Development/Libraries/Java
 Url:            http://www.antlr.org
 Source0:        antlr-%{version}.tar.bz2
 Source1:        manifest.antlr
-BuildRequires:  java-devel >= 1.6
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  unzip
 BuildRequires:  zip
 BuildArch:      noarch
@@ -94,7 +94,7 @@ function mkJar() {
     xargs jar cfm ${1}.jar manifest.* ;
   mv ${1}.jar $TARGET_DIR
 }
-COMPILER_COMMAND="javac -source 1.6 -target 1.6 -cp  "
+COMPILER_COMMAND="javac -source 8 -target 8 -cp  "
 delBinaryFiles
 mkdir src
 mv antlr src
diff --git a/antlr.changes b/antlr.changes
index 15773d1..85a475a 100644
--- a/antlr.changes
+++ b/antlr.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 15 05:54:51 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 Jan 12 11:53:47 UTC 2018 - tchvatal@suse.com
 
diff --git a/antlr.spec b/antlr.spec
index 9427c9d..99c595d 100644
--- a/antlr.spec
+++ b/antlr.spec
@@ -21,7 +21,7 @@ Name:           antlr
 Version:        2.7.7
 Release:        0
 Summary:        Another Tool for Language Recognition
-License:        GPL-2.0+ AND SUSE-Public-Domain AND MIT
+License:        GPL-2.0-or-later AND SUSE-Public-Domain AND MIT
 Group:          Development/Tools/Other
 Url:            http://www.antlr.org/
 Source0:        antlr-%{version}.tar.bz2
@@ -35,7 +35,7 @@ Patch2:         fix-docpath.diff
 BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
-BuildRequires:  java-devel >= 1.6
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-tools
 %if %{with python2}
 BuildRequires:  python2-base
@@ -55,7 +55,7 @@ or Java actions (you can use PCCTS 1.xx to generate C-based parsers).
 %package        java
 Summary:        ANother Tool for Language Recognition (Manual)
 Group:          Development/Tools/Other
-Requires:       java >= 1.6
+Requires:       java >= 1.8
 BuildArch:      noarch
 
 %description    java
@@ -123,7 +123,7 @@ find | grep "\(ShowString.java$\|StreamConverter.java$\)" && exit 42 || :
 %build
 ant \
     -Dj2se.apidoc=%{_javadocdir}/java \
-    -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
+    -Dant.build.javac.source=8 -Dant.build.javac.target=8 \
     jar
 %configure
 make -j1