diff --git a/ChangeLog.md b/ChangeLog.md
index fb82c95..185fd86 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -4,8 +4,8 @@ Change Log
 All notable changes to the project are documented in this file.
 
 
-[1.17.0][UNRELEASED]
---------------------
+[1.17.0][] - 2020-01-05
+-----------------------
 
 ### Changes
 - Simple multi-line support by Dima Volynets, @dvolynets
@@ -237,7 +237,8 @@ Adaptations to Debian editline package.
 - First version, forked from Minix current 2008-06-06
 
 
-[UNRELEASED]:    https://github.com/troglobit/finit/compare/1.16.1...HEAD
+[UNRELEASED]:    https://github.com/troglobit/finit/compare/1.17.0...HEAD
+[1.17.0]:        https://github.com/troglobit/finit/compare/1.16.1...1.17.0
 [1.16.1]:        https://github.com/troglobit/finit/compare/1.16.0...1.16.1
 [1.16.0]:        https://github.com/troglobit/finit/compare/1.15.3...1.16.0
 [1.15.3]:        https://github.com/troglobit/finit/compare/1.15.2...1.15.3
@@ -255,9 +256,3 @@ Adaptations to Debian editline package.
 [Travis-CI]:     https://travis-ci.org/troglobit/uftpd
 [Coverity Scan]: https://scan.coverity.com/projects/2947
 [README.md]:     https://github.com/troglobit/editline/blob/master/README.md
-
-<!--
-  -- Local Variables:
-  -- mode: markdown
-  -- End:
-  -->
diff --git a/configure.ac b/configure.ac
index 51c66dc..c39f47d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(editline, 1.17.0-dev, https://github.com/troglobit/editline/issues)
+AC_INIT(editline, 1.17.0, https://github.com/troglobit/editline/issues)
 AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
 AM_SILENT_RULES([yes])
 
diff --git a/debian/changelog b/debian/changelog
index 3b1a98c..6556e14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+editline (1.17.0) unstable; urgency=medium
+
+  * Simple multi-line support
+  * Handle internal realloc() errors better
+  * Fix return value from read_history() and write_history()
+  * Fix potential NULL pointer dereference in key binging lookup
+
+ -- Joachim Nilsson <troglobit@gmail.com>  Sun, 05 Jan 2020 09:47:34 +0100
+
 editline (1.16.1) unstable; urgency=medium
 
   * Minor bug fix and documentation update release.