diff --git a/CHANGELOG.md b/CHANGELOG.md
index b46f8b4c..f63c787b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 Project website: https://github.com/mviereck/x11docker
 
-## [Unreleased]
+## [6.4.0](https://github.com/mviereck/x11docker/releases/tag/v6.4.0) - 2019-11-14
 ### Added
  - `--xtest [=yes|no]`: New option to enable or disable X extension XTEST.
    Can be needed for custom access with xpra.
diff --git a/x11docker b/x11docker
index 85914f59..4477b237 100755
--- a/x11docker
+++ b/x11docker
@@ -11,7 +11,7 @@
 # Run 'x11docker --help' or scroll down to read usage information.
 # More documentation at:  https://github.com/mviereck/x11docker
 
-Version="6.3.2-beta"
+Version="6.4.0"
 
 # --enforce-i: Enforce running in interactive mode to allow commands tty and weston-launch in special setups.
 grep -q -- "--enforce-i" <<< "$*" && case $- in