diff --git a/ChangeLog b/ChangeLog
index e922f850..a423cd9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
 
+* Version 1.0.40:
+ - Support for TCP_FASTOPEN added on Linux
+ - The LDAP configuration file didn't allow a default gid without also
+defining a default uid. This is no longer the case.
+ - OpenBSD's glob() left the glob_t structure uninitialized if the
+pattern was larger than PATH_MAX, causing globfree() to free() an
+unwanted pointer. The bug was introduced in Pure-FTPd 1.0.34.
+
 * Version 1.0.39:
  - Explicitly include openssl/ec.h for OpenSSL 0.9.8 (CentOS 5)
  - Retry if SSL_shutdown() returns -1 and SSL_ERROR_WANT_(READ|WRITE)
diff --git a/NEWS b/NEWS
index 579d4324..9874b515 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,12 @@
 
+* Version 1.0.40:
+ - Support for TCP_FASTOPEN added on Linux
+ - The LDAP configuration file didn't allow a default gid without also
+defining a default uid. This is no longer the case.
+ - The process handling a user session could be crashed by trying to
+match a file pattern longer than the maximum length for a path. This
+has been fixed. Upgrading is recommended.
+
 * Version 1.0.39:
  - Compilation fix for ancient versions of OpenSSL.
  - TLS sockets shutdown fixed in order to prevent incomplete transfers.
diff --git a/README b/README
index b700cc7f..53ff515f 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 
                               .:. PURE-FTPD .:.
-                      Documentation for version 1.0.39
+                      Documentation for version 1.0.40
 
 
            ------------------------ BLURB ------------------------
diff --git a/configure.ac b/configure.ac
index 29443f47..33611f51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl AM_ACLOCAL_INCLUDE(m4)
 
 AC_PREREQ(2.65)
-AC_INIT([pure-ftpd],[1.0.39],[bugs at pureftpd dot org])
+AC_INIT([pure-ftpd],[1.0.40],[bugs at pureftpd dot org])
 AC_CONFIG_SRCDIR(src/ftpd.c)
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar])