diff --git a/lucene/SYSTEM_REQUIREMENTS.txt b/lucene/SYSTEM_REQUIREMENTS.txt
index 854f997b024..623120de281 100644
--- a/lucene/SYSTEM_REQUIREMENTS.txt
+++ b/lucene/SYSTEM_REQUIREMENTS.txt
@@ -1,11 +1,16 @@
 # System Requirements 
 
-Apache Lucene runs of Java 7 or greater. When using Java 7, be sure to 
-install at least Update 1! With all Java versions it is strongly 
-recommended to not use experimental `-XX` JVM options. It is also 
-recommended to always use the latest update version of your Java VM, 
-because bugs may affect Lucene. An overview of known JVM bugs can be 
-found on http://wiki.apache.org/lucene-java/JavaBugs. 
+Apache Lucene runs of Java 7 or greater, Java 8 is verified to be
+compatible and may bring some performance improvements. When using
+Oracle Java 7 or OpenJDK 7, be sure to not use the GA build 147 or
+update versions u40, u45 and u51! We recommend using u55 or later.
+
+It is also recommended to always use the latest update version of your
+Java VM, because bugs may affect Lucene. An overview of known JVM bugs
+can be found on http://wiki.apache.org/lucene-java/JavaBugs
+
+With all Java versions it is strongly recommended to not use experimental
+`-XX` JVM options.
 
 CPU, disk and memory requirements are based on the many choices made in 
 implementing Lucene (document size, number of documents, and number of 
diff --git a/solr/SYSTEM_REQUIREMENTS.txt b/solr/SYSTEM_REQUIREMENTS.txt
index dd918653311..a14c8f5d838 100644
--- a/solr/SYSTEM_REQUIREMENTS.txt
+++ b/solr/SYSTEM_REQUIREMENTS.txt
@@ -1,11 +1,16 @@
 # System Requirements 
 
-Apache Solr runs of Java 7 or greater. When using Java 7, be sure to 
-install at least Update 1! With all Java versions it is strongly 
-recommended to not use experimental `-XX` JVM options. It is also 
-recommended to always use the latest update version of your Java VM, 
-because bugs may affect Solr. An overview of known JVM bugs can be 
-found on http://wiki.apache.org/lucene-java/JavaBugs. 
+Apache Solr runs of Java 7 or greater, Java 8 is verified to be
+compatible and may bring some performance improvements. When using
+Oracle Java 7 or OpenJDK 7, be sure to not use the GA build 147 or
+update versions u40, u45 and u51! We recommend using u55 or later.
+
+It is also recommended to always use the latest update version of your
+Java VM, because bugs may affect Solr. An overview of known JVM bugs
+can be found on http://wiki.apache.org/lucene-java/JavaBugs
+
+With all Java versions it is strongly recommended to not use experimental
+`-XX` JVM options.
 
 CPU, disk and memory requirements are based on the many choices made in 
 implementing Solr (document size, number of documents, and number of