diff --git a/general.ent b/general.ent
index 1052046e8c..f64528ca5e 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "02">                   <!-- Always 2 digits -->
+<!ENTITY day          "03">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2018">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "May 2nd, &year;">
+<!ENTITY releasedate  "May 3rd, &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 5c6ab22083..37ba4021d0 100644
--- a/general/prog/openjdk.xml
+++ b/general/prog/openjdk.xml
@@ -348,7 +348,7 @@ done
 
 <screen role="root"><userinput>mkdir -pv /usr/share/applications &amp;&amp;
 
-cat &gt; /usr/share/applications/openjdk-9-java.desktop &lt;&lt; "EOF" &amp;&amp;
+cat &gt; /usr/share/applications/openjdk-java.desktop &lt;&lt; "EOF" &amp;&amp;
 <literal>[Desktop Entry]
 Name=OpenJDK Java &openjdk-version; Runtime
 Comment=OpenJDK Java &openjdk-version; Runtime
@@ -359,8 +359,8 @@ Icon=java
 MimeType=application/x-java-archive;application/java-archive;application/x-jar;
 NoDisplay=true</literal>
 EOF
-
-cat &gt; /usr/share/applications/openjdk-9-policytool.desktop &lt;&lt; "EOF" &amp;&amp;
+<!-- No policytool in java 10...
+cat &gt; /usr/share/applications/openjdk-policytool.desktop &lt;&lt; "EOF" &amp;&amp;
 <literal>[Desktop Entry]
 Name=OpenJDK Java &openjdk-version; Policy Tool
 Name[pt_BR]=OpenJDK Java &openjdk-version; - Ferramenta de Pol&#237;tica
@@ -372,8 +372,8 @@ Type=Application
 Icon=java
 Categories=Settings;</literal>
 EOF
-
-cat &gt; /usr/share/applications/openjdk-9-jconsole.desktop &lt;&lt; "EOF"
+-->
+cat &gt; /usr/share/applications/openjdk-jconsole.desktop &lt;&lt; "EOF"
 <literal>[Desktop Entry]
 Name=OpenJDK Java &openjdk-version; Console
 Comment=OpenJDK Java &openjdk-version; Console
@@ -384,14 +384,14 @@ Type=Application
 Icon=java
 Categories=Application;System;</literal>
 EOF</userinput></screen>
-
+<!-- Name[pt_BR] not do=isplayed anymore
     <para>
       The choice of pt_BR is just an example. You can add any translation
       by adding lines corresponding to your locale, e.g. for fr_FR,
       <quote>Name[fr_FR]=</quote> and <quote>Comment[fr_FR]=</quote> with the
       appropriate text as values.
     </para>
-
+-->
   </sect2>
 
   <sect2 role="commands">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index f608b55e48..6072925001 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,15 @@
       </itemizedlist>
     </listitem>
 -->
+   <listitem>
+      <para>May 3rd, 2018</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Remove version from OpenJDK .desktop files.</para>
+        </listitem>
+      </itemizedlist>
+   </listitem>
+
    <listitem>
       <para>May 2nd, 2018</para>
       <itemizedlist>