diff --git a/ChangeLog b/ChangeLog
index df06607..97d8924 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+firehol (3.1.7) - 2020-12-31
+
+  * FireHOL
+    - Fix dhcpv6 example to say dhcpv6 #438
+    - blacklist - add "nolog" option
+    - blacklist - reject with tcp-reset for outbound TCP connections
+    - firehol.service - Use `firehol start` for  ExecReload=
+    - Don't drop icmpv6 rules with FIREHOL_RULESET_MODE optimal #372
+
+  * FireQos
+    - workaround for cases where "-ifb" name gets truncated
+    - Fix for low-res timer check on openwrt
+
+  * Common
+    - Replace Travis with Github actions
+    - Various typo fixes
+    - Print unit test names as we run them
+    - Unit test fixes for Ubuntu 20.20 output differences
+
 firehol (3.1.6) - 2018-08-13
 
   * FireHOL
diff --git a/configure.ac b/configure.ac
index 821fcdf..a78e345 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl Package version
 define([VERSION_MAJOR], [3])
 define([VERSION_MINOR], [1])
 define([VERSION_FIX], [7])
-define([VERSION_SUFFIX], [_master])
+define([VERSION_SUFFIX], [])
 
 dnl Required program versions
 define([MIN_IPRANGE_VERSION], [1.0.2])