diff --git a/HISTORY.rst b/HISTORY.rst
index 4d77d189..d634e1fd 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,13 +3,12 @@
 Release History
 ---------------
 
-dev
-+++
+2.18.4 (2017-08-15)
++++++++++++++++++++
 
 **Improvements**
-- Error messages for invalid headers now include the header name for easier debugging
 
-**Bugfixes**
+- Error messages for invalid headers now include the header name for easier debugging
 
 **Dependencies**
 
diff --git a/requests/__version__.py b/requests/__version__.py
index 2d60bcc0..dc33eef6 100644
--- a/requests/__version__.py
+++ b/requests/__version__.py
@@ -5,8 +5,8 @@
 __title__ = 'requests'
 __description__ = 'Python HTTP for Humans.'
 __url__ = 'http://python-requests.org'
-__version__ = '2.18.3'
-__build__ = 0x021803
+__version__ = '2.18.4'
+__build__ = 0x021804
 __author__ = 'Kenneth Reitz'
 __author_email__ = 'me@kennethreitz.org'
 __license__ = 'Apache 2.0'