diff --git a/History.md b/History.md
index aa9a84c872..ae1d799c2a 100644
--- a/History.md
+++ b/History.md
@@ -1,6 +1,6 @@
 # Release History
 
-## Version ?? - ??
+## Version 20.05.31.5 - 31 May 2020
 
 ### gec
 
diff --git a/Readme.md b/Readme.md
index 8ff6b0bcb5..7356080cf6 100644
--- a/Readme.md
+++ b/Readme.md
@@ -57,7 +57,7 @@ library classes provided in this package.
 
 The supported Eiffel compilers, in alphabetical order, are:
 
-* Gobo Eiffel Compiler (gec) 20.03.22.1
+* Gobo Eiffel Compiler (gec) 20.05.31.5
 * ISE Eiffel 19.05.10.3187 and 19.12.10.3842 (Classic and .NET)
 
 For more details about the supported Eiffel compilers, please see the file
diff --git a/Release_notes.md b/Release_notes.md
index af8eb91cec..dcd4592375 100644
--- a/Release_notes.md
+++ b/Release_notes.md
@@ -1,4 +1,4 @@
-# Release notes - Gobo Eiffel 20.03.22.1
+# Release notes - Gobo Eiffel 20.05.31.5
 
 In order to see what is new in this release, please read [History.md](./History.md).
 
diff --git a/library/common/doc/index.html b/library/common/doc/index.html
index 1e4d6aca73..9477693383 100644
--- a/library/common/doc/index.html
+++ b/library/common/doc/index.html
@@ -106,7 +106,7 @@
 </p>
 
 <ul>
-	<li>Gobo Eiffel Compiler (gec) 20.03.22.1</li>
+	<li>Gobo Eiffel Compiler (gec) 20.05.31.5</li>
 	<li>ISE Eiffel 19.05.10.3187 and 19.12.10.3842 (Classic and .NET)</li>
 </ul>
 
diff --git a/library/free_elks/src/library.ecf b/library/free_elks/src/library.ecf
index a36134e110..bd4ad223b8 100644
--- a/library/free_elks/src/library.ecf
+++ b/library/free_elks/src/library.ecf
@@ -35,6 +35,21 @@
 		<mapping old_name="CHARACTER" new_name="CHARACTER_8"/>
 		<mapping old_name="CHARACTER_REF" new_name="CHARACTER_8_REF"/>
 		<mapping old_name="DOUBLE" new_name="REAL_64"/>
+		<external_include location="$(GOBO)/library/free_elks/src/elks/encoding/implementation/include">
+			<condition>
+				<platform excluded_value="windows"/>
+			</condition>
+		</external_include>
+		<external_cflag value="`$GOBO/library/free_elks/src/elks/encoding/implementation/unix/Clib/iconv-config --include_path`">
+			<condition>
+				<platform excluded_value="windows"/>
+			</condition>
+		</external_cflag>
+		<external_linker_flag value="`$(GOBO)/library/free_elks/src/elks/encoding/implementation/unix/Clib/iconv-config --library`">
+			<condition>
+				<platform excluded_value="windows"/>
+			</condition>
+		</external_linker_flag>
 		<cluster name="free_elks" location="./" recursive="true">
 			<file_rule>
 				<exclude>/structures/cursor_tree/compact_cursor_tree.e$</exclude>
@@ -60,20 +75,5 @@
 				</cluster>
 			</cluster>
 		</cluster>
-		<external_include location="$(GOBO)/library/free_elks/src/elks/encoding/implementation/include">
-			<condition>
-				<platform excluded_value="windows"/>
-			</condition>
-		</external_include>
-		<external_cflag value="`$GOBO/library/free_elks/src/elks/encoding/implementation/unix/Clib/iconv-config --include_path`">
-			<condition>
-				<platform excluded_value="windows"/>
-			</condition>
-		</external_cflag>
-		<external_linker_flag value="`$(GOBO)/library/free_elks/src/elks/encoding/implementation/unix/Clib/iconv-config --library`">
-			<condition>
-				<platform excluded_value="windows"/>
-			</condition>
-		</external_linker_flag>
 	</target>
 </system>
diff --git a/library/kernel/src/misc/kl_gobo_version.e b/library/kernel/src/misc/kl_gobo_version.e
index 761ac61c2e..3e66edbca9 100644
--- a/library/kernel/src/misc/kl_gobo_version.e
+++ b/library/kernel/src/misc/kl_gobo_version.e
@@ -13,7 +13,7 @@ class KL_GOBO_VERSION
 
 feature -- Constants
 
-	Version_number: STRING = "20.03.22.1"
+	Version_number: STRING = "20.05.31.5"
 			-- Version number.
 			-- Format: year.month.day.number_of_commits_on_that_day
 
diff --git a/tool/geimage/doc/implementation.html b/tool/geimage/doc/implementation.html
index 0e1f72cf4d..fc9615c6f6 100644
--- a/tool/geimage/doc/implementation.html
+++ b/tool/geimage/doc/implementation.html
@@ -7,7 +7,7 @@
   <table border="0" width="100%">
    <tr>
     <td><font size="6"><strong>Implementation of geimage</strong></font></td>
-    <td align="right"><a href="usage.html"><img src="image/previous.gif" alt="Previous" border="0" /></a><a href="index.html"><img src="image/next.gif" alt="Next" border="0" /></a></td>
+    <td align="right"><a href="usage.html"><img src="image/previous.gif" alt="Previous" border="0" /></a><a href="see_also.html"><img src="image/next.gif" alt="Next" border="0" /></a></td>
    </tr>
   </table>
   <hr size="1" />
@@ -84,7 +84,7 @@ <h2>Speed of generation</h2>
     <td>
      <address><font size="2"><b>Copyright © 2020, Eric Bezault</b><br /><b>mailto:</b><a href="mailto:ericb@gobosoft.com">ericb@gobosoft.com</a><br /><b>http://</b><a href="http://www.gobosoft.com">www.gobosoft.com</a><br /><b>Last Updated: </b>17 May 2020</font></address>
     </td>
-    <td align="right" valign="top"><a href="http://www.gobosoft.com"><img src="image/home.gif" alt="Home" border="0" /></a><a href="index.html"><img src="image/toc.gif" alt="Toc" border="0" /></a><a href="usage.html"><img src="image/previous.gif" alt="Previous" border="0" /></a><a href="index.html"><img src="image/next.gif" alt="Next" border="0" /></a></td>
+    <td align="right" valign="top"><a href="http://www.gobosoft.com"><img src="image/home.gif" alt="Home" border="0" /></a><a href="index.html"><img src="image/toc.gif" alt="Toc" border="0" /></a><a href="usage.html"><img src="image/previous.gif" alt="Previous" border="0" /></a><a href="see_also.html"><img src="image/next.gif" alt="Next" border="0" /></a></td>
    </tr>
   </table>
  </body>
diff --git a/tool/geimage/doc/usage.html b/tool/geimage/doc/usage.html
index 62340f76aa..0a2c7a0df1 100644
--- a/tool/geimage/doc/usage.html
+++ b/tool/geimage/doc/usage.html
@@ -7,7 +7,7 @@
   <table border="0" width="100%">
    <tr>
     <td><font size="6"><strong>Using geimage</strong></font></td>
-    <td align="right"><a href="index.html"><img src="image/previous.gif" alt="Previous" border="0" /></a><a href="index.html"><img src="image/next.gif" alt="Next" border="0" /></a></td>
+    <td align="right"><a href="index.html"><img src="image/previous.gif" alt="Previous" border="0" /></a><a href="implementation.html"><img src="image/next.gif" alt="Next" border="0" /></a></td>
    </tr>
   </table>
   <hr size="1" />
@@ -82,7 +82,7 @@ <h2>Command-line options</h2>
     <td>
      <address><font size="2"><b>Copyright © 2020, Eric Bezault</b><br /><b>mailto:</b><a href="mailto:ericb@gobosoft.com">ericb@gobosoft.com</a><br /><b>http://</b><a href="http://www.gobosoft.com">www.gobosoft.com</a><br /><b>Last Updated: </b>17 May 2020</font></address>
     </td>
-    <td align="right" valign="top"><a href="http://www.gobosoft.com"><img src="image/home.gif" alt="Home" border="0" /></a><a href="index.html"><img src="image/toc.gif" alt="Toc" border="0" /></a><a href="index.html"><img src="image/previous.gif" alt="Previous" border="0" /></a><a href="index.html"><img src="image/next.gif" alt="Next" border="0" /></a></td>
+    <td align="right" valign="top"><a href="http://www.gobosoft.com"><img src="image/home.gif" alt="Home" border="0" /></a><a href="index.html"><img src="image/toc.gif" alt="Toc" border="0" /></a><a href="index.html"><img src="image/previous.gif" alt="Previous" border="0" /></a><a href="implementation.html"><img src="image/next.gif" alt="Next" border="0" /></a></td>
    </tr>
   </table>
  </body>