diff --git a/wmbiff/ChangeLog b/wmbiff/ChangeLog
index 6d1ee66..4618130 100644
--- a/wmbiff/ChangeLog
+++ b/wmbiff/ChangeLog
@@ -1,3 +1,22 @@
+2017-06-23  Doug Torrance <dtorrance@piedmont.edu>
+
+	* ChangeLog, NEWS, configure.ac: Bump to version 0.4.31.
+
+2017-06-23  Doug Torrance <dtorrance@piedmont.edu>
+
+	* wmbiff/Imap4Client.c, wmbiff/ShellClient.c,
+	wmbiff/passwordMgr.c, wmbiff/test_wmbiff.c:
+	Remove #define _GNU_SOURCE; already defined in CFLAGS.
+
+
+2017-06-23  Doug Torrance <dtorrance@piedmont.edu>
+
+	* wmbiff/maildirClient.c: Manually copy mailbox path.
+
+	Patch by Demi <m@tfiu.de> to fix Debian bug #621690 [1].
+
+	[1] https://bugs.debian.org/621690
+
 2016-11-30  Doug Torrance <dtorrance@piedmont.edu>
 
         * ChangeLog, NEWS, configure.ac: Bump to verson 0.4.30.
diff --git a/wmbiff/NEWS b/wmbiff/NEWS
index dd0e2d4..8a76137 100644
--- a/wmbiff/NEWS
+++ b/wmbiff/NEWS
@@ -1,5 +1,8 @@
 Release Notes
 ~~~~~~~~~~~~~
+Release 0.4.31 - June 23, 2017
+  * Bug fix.
+
 Release 0.4.30 - November 30, 2016
   * Bug fixes.
 
diff --git a/wmbiff/configure.ac b/wmbiff/configure.ac
index 1409bb4..2622e7a 100644
--- a/wmbiff/configure.ac
+++ b/wmbiff/configure.ac
@@ -6,7 +6,7 @@ dnl and configure:
 dnl  installation prefix
 dnl  version
 
-AC_INIT(WMBiff, 0.4.30, wmaker-dev@lists.windowmaker.org, wmbiff)
+AC_INIT(WMBiff, 0.4.31, wmaker-dev@lists.windowmaker.org, wmbiff)
 AC_CONFIG_AUX_DIR(autoconf)
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADER([config.h])