diff --git a/HISTORY.rst b/HISTORY.rst
index 05f1f71..f8b0b31 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,12 @@
 History
 -------
 
+3.4.0 (2016-30-04)
+++++++++++++++++++
+- Added `upload_video` endpoint
+- Fix quoted status checks in `html_for_tweet`
+- Fix `html_for_tweet` method response when hashtag/mention is a substring of another
+
 3.3.0 (2015-18-07)
 ++++++++++++++++++
 - Added support for muting users
diff --git a/docs/conf.py b/docs/conf.py
index 480a355..23044e3 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -50,9 +50,9 @@ copyright = u'2013, Ryan McGrath'
 # built documents.
 #
 # The short X.Y version.
-version = '3.3.0'
+version = '3.4.0'
 # The full version, including alpha/beta/rc tags.
-release = '3.3.0'
+release = '3.4.0'
 
 # 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 6d05baf..7b38b99 100755
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ except ImportError:
     from distutils.core import setup
 
 __author__ = 'Ryan McGrath <ryan@venodesigns.net>'
-__version__ = '3.3.0'
+__version__ = '3.4.0'
 
 packages = [
     'twython',
diff --git a/twython/__init__.py b/twython/__init__.py
index 3525f3c..1e57cee 100644
--- a/twython/__init__.py
+++ b/twython/__init__.py
@@ -19,7 +19,7 @@ Questions, comments? ryan@venodesigns.net
 """
 
 __author__ = 'Ryan McGrath <ryan@venodesigns.net>'
-__version__ = '3.3.0'
+__version__ = '3.4.0'
 
 from .api import Twython
 from .streaming import TwythonStreamer