diff --git a/CHANGES b/CHANGES
index eb0080ec..4abece81 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+CHANGES FROM 3.6 TO 3.6a
+
+* Fix compile error on FreeBSD (from Yasuhiro Kimura, issue 4701).
+
 CHANGES FROM 3.5a TO 3.6
 
 * Add seconds options for clock mode (issue 4697).
diff --git a/configure.ac b/configure.ac
index 4be9e03a..200e82de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # configure.ac
 
-AC_INIT([tmux], 3.6)
+AC_INIT([tmux], 3.6a)
 AC_PREREQ([2.60])
 
 AC_CONFIG_AUX_DIR(etc)