diff --git a/general.ent b/general.ent
index 2cd8008144..4f52b346c6 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "04">                   <!-- Always 2 digits -->
+<!ENTITY day          "06">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2015">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "May 4th, &year;">
+<!ENTITY releasedate  "May 6th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development] -->
diff --git a/general/prog/openjdk.xml b/general/prog/openjdk.xml
index 8e4c49cc8d..812a5a6994 100644
--- a/general/prog/openjdk.xml
+++ b/general/prog/openjdk.xml
@@ -441,7 +441,7 @@ LANG=C ${JT_HOME}/bin/jtreg -a -v:fail,error \
       results</ulink>, although they usually are run on a newer version.
       There are a few failures, the number of which depends on various
       conditions, like whether the computer is connected to network. Also, some
-      test may timeout if the machine is under load.
+      tests may timeout if the machine is under load.
     </para>
 
     <para>
diff --git a/gnome/applications/epiphany.xml b/gnome/applications/epiphany.xml
index 92ef8b38e6..20569dffdc 100644
--- a/gnome/applications/epiphany.xml
+++ b/gnome/applications/epiphany.xml
@@ -37,7 +37,7 @@
       users. Its principles are simplicity and standards compliance.
     </para>
 
-    &lfs77_checked;
+    &lfs77_checked; &gcc5_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/multimedia/audioutils/freetts.xml b/multimedia/audioutils/freetts.xml
index d943222a0f..adca0ffa1f 100644
--- a/multimedia/audioutils/freetts.xml
+++ b/multimedia/audioutils/freetts.xml
@@ -48,7 +48,7 @@
       to convert text to audible speech through the system audio hardware.
     </para>
 
-    &lfs77_checked;
+    &lfs77_checked; &gcc5_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/postlfs/editors/emacs.xml b/postlfs/editors/emacs.xml
index 2da1d8a3be..bd2c77007a 100644
--- a/postlfs/editors/emacs.xml
+++ b/postlfs/editors/emacs.xml
@@ -32,7 +32,7 @@
     <para>The <application>Emacs</application> package contains an extensible,
     customizable, self-documenting real-time display editor.</para>
 
-    &lfs77_checked;
+    &lfs77_checked; &gcc5_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -101,7 +101,9 @@
 <screen><userinput>./configure --prefix=/usr        \
             --without-gnutls     \
             --localstatedir=/var &amp;&amp;
-make bootstrap</userinput></screen>
+make</userinput></screen>
+<!-- make bootstrap only necessary for development versions obtained with git
+-->
 
     <para>
       This package does not come with a test suite. If make succeeds, you can
diff --git a/pst/scanning/sane.xml b/pst/scanning/sane.xml
index 408047d4b1..440bc07f1d 100644
--- a/pst/scanning/sane.xml
+++ b/pst/scanning/sane.xml
@@ -50,7 +50,7 @@
     ends. The back ends are drivers for the supported scanners and cameras. The
     front ends are user interfaces to access the backends.</para>
 
-    &lfs77_checked;
+    &lfs77_checked; &gcc5_checked;
 
     <!-- The upstream web site has the md5sums for the tarballs:
          http://www.sane-project.org/sane-md5sums.txt.
diff --git a/pst/scanning/xsane.xml b/pst/scanning/xsane.xml
index b11d6e568c..e7aa1cc0a6 100644
--- a/pst/scanning/xsane.xml
+++ b/pst/scanning/xsane.xml
@@ -34,7 +34,7 @@
     <xref linkend="sane"/>. It has additional features to improve the image
     quality and ease of use compared to <command>xscanimage</command>.</para>
 
-    &lfs77_checked;
+    &lfs77_checked; &gcc5_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/server/databases/db.xml b/server/databases/db.xml
index 653e4c0509..34b20c8d13 100644
--- a/server/databases/db.xml
+++ b/server/databases/db.xml
@@ -76,8 +76,10 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="tcl"/>,
-      <xref linkend="openjdk"/><!-- or <xref linkend="jdk"/> -->, and
-      <xref linkend="sharutils"/> (for the <command>uudecode</command> command)
+      <xref linkend="openjdk"/> (the Java bindings are currently broken with
+      JDK8)<!-- or <xref linkend="jdk"/> -->, and
+      <xref linkend="sharutils"/> (for the <command>uudecode</command> command
+      - Java bindings are required)
     </para>
 
     <para condition="html" role="usernotes">
@@ -241,9 +243,10 @@ chown -v -R root:root                        \
     </para>
 
     <para>
-      <option>--enable-java</option>: Enables
-      <application>Java</application> support in DB and creates the
+      <option>--enable-java</option>: Enables <application>Java</application>
+      support in DB and creates the
       <filename class="libraryfile">libdb_java</filename> libraries.
+      The Java bindings are currently broken with JDK8.
     </para>
   </sect2>