diff --git a/CHANGELOG.md b/CHANGELOG.md
index b69aaef9..0ccc7793 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,22 +1,23 @@
-# v3.9.18-beta.1
+# v3.9.18
 
 ## Enhancements
 
+- It's possible to open ".mak" or "makefile" files as projects.
+  The project inspector displays the rules as configurations and the content of the "src/", "include/", or "import/" sub directories as source files.
 - Search and Replace: after a failed search give the editor the focus back.
-- It's possible to open ".mak" or "makefile" files as projects. The project inspector will display the rules as configurations and the content of "src/", "include/", "import/" as source files.
-- Added new symbolic strings _CLN_ (CaretLineNUmber) and _CCN_ (CaretColumnNumber).
+- Added new symbolic strings _CLN_ (CaretLineNumber) and _CCN_ (CaretColumnNumber).
 
 ## Bugs fixed
 
 - Crash to desktop for certain invalid or incomplete D constructs. (#107)
 - Project configuration index not handled with option "reloadLastDocuments".
 - Project groups widget, adding new items was broken.
-- Project groups, workspace persistence, the config index was not properly saved and restore.
+- Project groups, workspace reloading, the config index was not properly saved and restore.
 
 ## Other
 
-- dexed-d does not rely on the old "iz" library anymore.
-- last version that can be build with Lazarus 2.1.z
+- libdexed-d does not rely on the old "iz" library anymore.
+- last version that can be build with Lazarus 2.0.z
 
 # v3.9.17
 
diff --git a/README.md b/README.md
index 288d3313..5c4782e6 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Dexed, the _D Extended EDitor_, is an IDE for the [D programming language](https
 
 - available for _Linux_ or _Windows_.
 - supports all the D compilers (DMD-GDC-LDC).
-- supports the DUB projects (JSON or SDL) and also its own project format.
+- supports the DUB projects (JSON or SDL), makefiles as projects, and also its own project format.
 - supports the DUB scripts (aka _single file packages_) and its own script format (aka _runnable modules_).
 - full [D Completion Daemon](https://github.com/dlang-community/DCD) integration (completion, ddoc display, call tips, jump to declaration, rename identifier).
 - Dynamic [D-Scanner](https://github.com/dlang-community/D-Scanner) linting with results displayed in the editor gutter.
@@ -24,16 +24,16 @@ Dexed, the _D Extended EDitor_, is an IDE for the [D programming language](https
 
 ## Project information
 
-- :bookmark: latest release: version 3.9.17, Thu 9 Dec 2021.
+- :bookmark: latest release: version 3.9.18, Mon 16 May 2022.
 - :scroll: licensed under the terms of the Boost software license.
 - :dollar: Development can be supported with [Paypal donations](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=AQDJVC39PJF7J).
 
-## Download version 3.9.17
+## Download version 3.9.18
 
-- :package: [setup program for Linux 64 bit](https://gitlab.com/basile.b/dexed/-/releases/v3.9.17/downloads/binaries/dexed.3.9.17.linux64.setup.zip)
-- :package: [binaries for Linux 64 bit](https://gitlab.com/basile.b/dexed/-/releases/v3.9.17/downloads/binaries/dexed.3.9.17.linux64.zip)
-- :package: [rpm for Linux 64 bit](https://gitlab.com/basile.b/dexed/-/releases/v3.9.17/downloads/binaries/dexed-3.9.17-0.x86_64.rpm)
-- :package: [deb for Linux 64 bit](https://gitlab.com/basile.b/dexed/-/releases/v3.9.17/downloads/binaries/dexed-3.9.17.amd64.deb)
+- :package: [setup program for Linux 64 bit](https://gitlab.com/basile.b/dexed/-/releases/v3.9.18/downloads/binaries/dexed.3.9.18.linux64.setup.zip)
+- :package: [binaries for Linux 64 bit](https://gitlab.com/basile.b/dexed/-/releases/v3.9.18/downloads/binaries/dexed.3.9.18.linux64.zip)
+- :package: [rpm for Linux 64 bit](https://gitlab.com/basile.b/dexed/-/releases/v3.9.18/downloads/binaries/dexed-3.9.18-0.x86_64.rpm)
+- :package: [deb for Linux 64 bit](https://gitlab.com/basile.b/dexed/-/releases/v3.9.18/downloads/binaries/dexed-3.9.18.amd64.deb)
 
 The _zip_ archives allow to move freely the files.
 The _setup.zip_ archives contain a command line program that installs to predefined locations so that the software can be run without additional intervention.
diff --git a/setup/version.txt b/setup/version.txt
index 1f18d461..d0033e6e 100644
--- a/setup/version.txt
+++ b/setup/version.txt
@@ -1 +1 @@
-v3.9.18-beta.1
+v3.9.18