diff --git a/ChangeLog b/ChangeLog
index cf5b9c9a3ed..6cb5672a643 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-1.2.17 released
+* 2.0.7 released
 
 	* fix issue in use of copy_file_range() on linux
 	* avoid open-file race in the file_view_pool
@@ -120,6 +120,7 @@
 	* libtorrent now requires C++14 to build
 	* added support for GnuTLS for HTTPS and torrents over SSL
 
+1.2.17 released
 
 	* fixed tracker connections spinning when hostname lookups stall
 	* fixed error in pkg-config file generation in Jamfile
diff --git a/Jamfile b/Jamfile
index d596d1f162d..4792eb1bd7a 100644
--- a/Jamfile
+++ b/Jamfile
@@ -12,7 +12,7 @@ import cast ;
 
 # we need version numbers in the form X.Y.Z in order to trigger the built-in
 # support for generating symlinks to the installed library
-VERSION = 2.0.6 ;
+VERSION = 2.0.7 ;
 
 BOOST_ROOT = [ modules.peek : BOOST_ROOT ] ;
 CXXFLAGS = [ modules.peek : CXXFLAGS ] ;
diff --git a/Makefile b/Makefile
index cf0ea8cb234..382050ead3a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=2.0.6
+VERSION=2.0.7
 
 BUILD_CONFIG=release link=shared crypto=openssl warnings=off address-model=64
 
diff --git a/bindings/python/setup.py b/bindings/python/setup.py
index 66dd4956018..5c2dbebc034 100644
--- a/bindings/python/setup.py
+++ b/bindings/python/setup.py
@@ -448,7 +448,7 @@ def _configure_b2_with_distutils(self):
 
 setuptools.setup(
     name="libtorrent",
-    version="2.0.6",
+    version="2.0.7",
     author="Arvid Norberg",
     author_email="arvid@libtorrent.org",
     description="Python bindings for libtorrent-rasterbar",
diff --git a/docs/header.rst b/docs/header.rst
index 4cfda992014..e898029c976 100644
--- a/docs/header.rst
+++ b/docs/header.rst
@@ -1 +1 @@
-:Version: 2.0.6
+:Version: 2.0.7
diff --git a/docs/hunspell/libtorrent.dic b/docs/hunspell/libtorrent.dic
index 86e36a805c7..38ad41552b1 100644
--- a/docs/hunspell/libtorrent.dic
+++ b/docs/hunspell/libtorrent.dic
@@ -551,7 +551,7 @@ cpp
 tos
 BP
 qB
-LT2060
+LT2070
 iocontrol
 getname
 getpeername
diff --git a/include/libtorrent/version.hpp b/include/libtorrent/version.hpp
index d4c49b2b998..bc6c19c5747 100644
--- a/include/libtorrent/version.hpp
+++ b/include/libtorrent/version.hpp
@@ -39,27 +39,27 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #define LIBTORRENT_VERSION_MAJOR 2
 #define LIBTORRENT_VERSION_MINOR 0
-#define LIBTORRENT_VERSION_TINY 6
+#define LIBTORRENT_VERSION_TINY 7
 
 // the format of this version is: MMmmtt
 // M = Major version, m = minor version, t = tiny version
 #define LIBTORRENT_VERSION_NUM ((LIBTORRENT_VERSION_MAJOR * 10000) + (LIBTORRENT_VERSION_MINOR * 100) + LIBTORRENT_VERSION_TINY)
 
-#define LIBTORRENT_VERSION "2.0.6.0"
-#define LIBTORRENT_REVISION "7cf79a8d1"
+#define LIBTORRENT_VERSION "2.0.7.0"
+#define LIBTORRENT_REVISION "9cbecaa64"
 
 namespace libtorrent {
 
 	// the major, minor and tiny versions of libtorrent
 	constexpr int version_major = 2;
 	constexpr int version_minor = 0;
-	constexpr int version_tiny = 6;
+	constexpr int version_tiny = 7;
 
 	// the libtorrent version in string form
-	constexpr char const* version_str = "2.0.6.0";
+	constexpr char const* version_str = "2.0.7.0";
 
 	// the git commit of this libtorrent version
-	constexpr std::uint64_t version_revision = 0x7cf79a8d1;
+	constexpr std::uint64_t version_revision = 0x9cbecaa64;
 
 	// returns the libtorrent version as string form in this format:
 	// "<major>.<minor>.<tiny>.<tag>"
diff --git a/src/settings_pack.cpp b/src/settings_pack.cpp
index f19bed8bc53..d005b6330fe 100644
--- a/src/settings_pack.cpp
+++ b/src/settings_pack.cpp
@@ -148,7 +148,7 @@ constexpr int DISK_WRITE_MODE = settings_pack::enable_os_cache;
 		SET(proxy_username, "", &session_impl::update_proxy),
 		SET(proxy_password, "", &session_impl::update_proxy),
 		SET(i2p_hostname, "", &session_impl::update_i2p_bridge),
-		SET(peer_fingerprint, "-LT2060-", nullptr),
+		SET(peer_fingerprint, "-LT2070-", nullptr),
 		SET(dht_bootstrap_nodes, "dht.libtorrent.org:25401", &session_impl::update_dht_bootstrap_nodes)
 	}});