diff --git a/wmbiff/ChangeLog b/wmbiff/ChangeLog
index 43de914..fe78424 100644
--- a/wmbiff/ChangeLog
+++ b/wmbiff/ChangeLog
@@ -1,3 +1,19 @@
+2020-04-17  Jeremy Sowden <jeremy@azazel.net>
+
+	* ChangeLog, configure.ac: wmbiff: bump to 0.4.36.
+
+2020-04-17  Jeremy Sowden <jeremy@azazel.net>
+
+	* wmgeneral/wmgeneral.c, wmgeneral/wmgeneral.h:
+	wmbiff: fix multiple definitions of display variable.  The display
+	variable is declared in a header with no explicit linkage.  This results
+	in there being multiple definitions of it in wmbiff.o and libwmgeneral.a
+	and a failure during linking with gcc 10.  Add `extern` to the header
+	declaration and a separate declaration with no linkage in wmgeneral.c
+	where it is assigned.
+	Link: https://bugs.debian.org/957937
+	Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
+
 2019-07-23  Jeremy Sowden <jeremy@azazel.net>
 
 	* ChangeLog, NEWS, configure.ac: bumped to 0.4.35.
diff --git a/wmbiff/NEWS b/wmbiff/NEWS
index a9570b7..b4e82c8 100644
--- a/wmbiff/NEWS
+++ b/wmbiff/NEWS
@@ -1,5 +1,8 @@
 Release Notes
 ~~~~~~~~~~~~~
+Release 0.4.36 - April 4, 2020
+  * GCC 10 linkage fix.
+
 Release 0.4.35 - July 23, 2019
   * TLS SNI support.
 
diff --git a/wmbiff/configure.ac b/wmbiff/configure.ac
index b7948f6..a8b1aac 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.35, wmaker-dev@googlegroups.com, wmbiff)
+AC_INIT(WMBiff, 0.4.36, wmaker-dev@googlegroups.com, wmbiff)
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADER([config.h])
 dnl make sure autoheader finds version, implicitly defined above.