diff --git a/CHANGES.rst b/CHANGES.rst
index 2b9a7e081..2f0773177 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+**2015-12-29**
+
+*Released 3.1.2*
+
+- Fix custom path for file downloads
+- Don't stop the dispatcher thread on uncaught errors in handlers
+
 **2015-12-21**
 
 *Released 3.1.1*
diff --git a/docs/source/conf.py b/docs/source/conf.py
index c8a16f1f1..6c8ca80bf 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -60,7 +60,7 @@ author = u'Leandro Toledo'
 # The short X.Y version.
 version = '3.1'
 # The full version, including alpha/beta/rc tags.
-release = '3.1.1'
+release = '3.1.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index 38d7c54dd..083904989 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ def requirements():
 
 setup(
     name='python-telegram-bot',
-    version='3.1.1',
+    version='3.1.2',
     author='Leandro Toledo',
     author_email='devs@python-telegram-bot.org',
     license='LGPLv3',
diff --git a/telegram/__init__.py b/telegram/__init__.py
index 54bcd18a5..ea7e978d7 100644
--- a/telegram/__init__.py
+++ b/telegram/__init__.py
@@ -19,7 +19,7 @@
 """A library that provides a Python interface to the Telegram Bot API"""
 
 __author__ = 'devs@python-telegram-bot.org'
-__version__ = '3.1.1'
+__version__ = '3.1.2'
 
 from .base import TelegramObject
 from .user import User