diff --git a/ChangeLog b/ChangeLog
index dd8ca4106..17fc30fb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+1.2.1 release
+
 	* add dht_pkt_alert and alerts_dropped_alert to python bindings
 	* fix python bindins for block_uploaded_alert
 	* optimize resolving duplicate filenames in loading torrent files
diff --git a/Jamfile b/Jamfile
index 29e180f2b..73374f034 100644
--- a/Jamfile
+++ b/Jamfile
@@ -43,7 +43,7 @@ else
 		: : $(boost-include-path) ;
 }
 
-VERSION = 1.2.0 ;
+VERSION = 1.2.1 ;
 
 rule linking ( properties * )
 {
diff --git a/bindings/python/setup.py b/bindings/python/setup.py
index 9cce2c3b2..d47cd9a8f 100644
--- a/bindings/python/setup.py
+++ b/bindings/python/setup.py
@@ -179,7 +179,7 @@ else:
 
 setup(
     name='python-libtorrent',
-    version='1.2.0',
+    version='1.2.1',
     author='Arvid Norberg',
     author_email='arvid@libtorrent.org',
     description='Python bindings for libtorrent-rasterbar',
diff --git a/build_dist.sh b/build_dist.sh
index cc85ace9f..5c59c8eb8 100755
--- a/build_dist.sh
+++ b/build_dist.sh
@@ -16,7 +16,7 @@ chmod a-x docs/*.rst docs/*.htm* src/*.cpp include/libtorrent/*.hpp
 ./configure --enable-python-binding --enable-examples=yes --enable-encryption --enable-tests=yes
 make dist
 
-VERSION=1.2.0
+VERSION=1.2.1
 
 tar xvzf libtorrent-rasterbar-${VERSION}.tar.gz
 cd libtorrent-rasterbar-${VERSION}/test
diff --git a/configure.ac b/configure.ac
index cafeba3b3..81a1410a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([libtorrent-rasterbar],[1.2.0],[arvid@libtorrent.org],
+AC_INIT([libtorrent-rasterbar],[1.2.1],[arvid@libtorrent.org],
         [libtorrent-rasterbar],[http://www.libtorrent.org])
 AC_CONFIG_SRCDIR([src/torrent.cpp])
 AC_CONFIG_AUX_DIR([build-aux])
diff --git a/docs/header.rst b/docs/header.rst
index b3da2beca..81c07584b 100644
--- a/docs/header.rst
+++ b/docs/header.rst
@@ -1,3 +1,3 @@
 :Author: Arvid Norberg, arvid@libtorrent.org
-:Version: 1.2.0
+:Version: 1.2.1
 
diff --git a/include/libtorrent/version.hpp b/include/libtorrent/version.hpp
index 333136965..fa8030eec 100644
--- a/include/libtorrent/version.hpp
+++ b/include/libtorrent/version.hpp
@@ -37,14 +37,14 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #define LIBTORRENT_VERSION_MAJOR 1
 #define LIBTORRENT_VERSION_MINOR 2
-#define LIBTORRENT_VERSION_TINY 0
+#define LIBTORRENT_VERSION_TINY 1
 
 // 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 "1.2.0.0"
-#define LIBTORRENT_REVISION "c76e9cc5e"
+#define LIBTORRENT_VERSION "1.2.1.0"
+#define LIBTORRENT_REVISION "f21a39496"
 
 namespace libtorrent {
 
diff --git a/src/settings_pack.cpp b/src/settings_pack.cpp
index 4ab2321b5..3efb0b3b1 100644
--- a/src/settings_pack.cpp
+++ b/src/settings_pack.cpp
@@ -123,7 +123,7 @@ constexpr int CLOSE_FILE_INTERVAL = 0;
 		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, "-LT1200-", nullptr),
+		SET(peer_fingerprint, "-LT1210-", nullptr),
 		SET(dht_bootstrap_nodes, "dht.libtorrent.org:25401", &session_impl::update_dht_bootstrap_nodes)
 	}});