diff --git a/ChangeLog.rst b/ChangeLog.rst
index 407d1ec5..0ada5522 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+New in version 3.1.0
+--------------------
+* Add TLS support for TCP sockets.
+* Fix corner case when dead hashed server comes back alive.
+
 New in version 3.0.1
 --------------------
 * Make MockMemcacheClient more consistent with the real client.
diff --git a/README.rst b/README.rst
index f170cd2a..81d3cbfa 100644
--- a/README.rst
+++ b/README.rst
@@ -125,6 +125,7 @@ Credits
 * `Jon Parise <https://github.com/jparise>`_
 * `Stephen Rosen <https://github.com/sirosen>`_
 * `Feras Alazzeh <https://github.com/FerasAlazzeh>`_
+* `Moisés Guimarães de Medeiros <https://github.com/moisesguimaraes>`_
 
 We're Hiring!
 =============
diff --git a/docs/conf.py b/docs/conf.py
index b2a0c475..58f08751 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -64,9 +64,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'3.0'
+version = u'3.1'
 # The full version, including alpha/beta/rc tags.
-release = u'3.0.0'
+release = u'3.1.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/pymemcache/__init__.py b/pymemcache/__init__.py
index f6bfca94..419dd578 100644
--- a/pymemcache/__init__.py
+++ b/pymemcache/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '3.0.1'
+__version__ = '3.1.0'
 
 from pymemcache.client.base import Client  # noqa
 from pymemcache.client.base import PooledClient  # noqa
diff --git a/setup.cfg b/setup.cfg
index 2113420b..c53a5c4f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,8 +1,8 @@
 [metadata]
 name = pymemcache
 version = attr: pymemcache.__version__
-author = Charles Gordon
-author_email = charles@pinterest.com
+author = Jon Parise
+author_email = jon@pinterest.com
 description = "A comprehensive, fast, pure Python memcached client"
 long_description = file: README.rst, ChangeLog.rst
 long_description_content_type = text/x-rst