diff --git a/NEWS.md b/NEWS.md
index 02d0804c..8d0a2a49 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,23 @@
+# Release notes for xrdp v0.9.4 (2017/09/XX)
+
+## New features
+  * Accept prefill credentials in base64 form #153 #811
+  * Indroduce AAC encoder to audio redirection (requires Windows 10)
+
+## Bugfixes
+  * Fix ocasional SEGV in drive redirection #838
+  * Fix client's IP addresses in xrdp-sesman.log are always logged as `0.0.0.0` #878 #882
+  * Fix `ls_background_image` didn't accept full path #776 #853
+  * Fix misuse of hidelogwindow #414 #876
+  * Fix WTSVirtualChannelWrite return code #859
+  * Fix no longer needed socket files remained in the socket dir #812 #831
+  * Make creating socket path a bit more robust #823
+
+## Other changes
+  * Add Belgian keyboard #858
+  * Add a PAM file for FreeBSD #824
+  * Several refactorings and cosmetic changes
+
 # Release notes for xrdp v0.9.3.1 (2017/08/16)
 
 This release fixes a trivial packaging issue #848 occurred in v0.9.3.  The issue only affects systemd systems.  This release is principally for distro packagers or users who compile & install xrdp from source.
diff --git a/README.md b/README.md
index ff275cb8..ddbbf3fa 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/neutrinolabs/xrdp)
 ![Apache-License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)
 
-*Current Version:* 0.9.3.1
+*Current Version:* 0.9.4
 
 # xrdp - an open source RDP server
 
diff --git a/configure.ac b/configure.ac
index 6464c631..aa9f51c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script
 
 AC_PREREQ(2.65)
-AC_INIT([xrdp], [0.9.3.1], [xrdp-devel@googlegroups.com])
+AC_INIT([xrdp], [0.9.4], [xrdp-devel@googlegroups.com])
 AC_CONFIG_HEADERS(config_ac.h:config_ac-h.in)
 AM_INIT_AUTOMAKE([1.7.2 foreign])
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/xorg/X11R7.6/rdp/rdp.h b/xorg/X11R7.6/rdp/rdp.h
index f9240403..c563fe9a 100644
--- a/xorg/X11R7.6/rdp/rdp.h
+++ b/xorg/X11R7.6/rdp/rdp.h
@@ -76,7 +76,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 //#include "colormapst.h"
 
-#define X11RDPVER "0.9.3"
+#define X11RDPVER "0.9.4"
 
 #define PixelDPI 100
 #define PixelToMM(_size) (((_size) * 254 + (PixelDPI) * 5) / ((PixelDPI) * 10))