diff --git a/changelog.rst b/changelog.rst
index 6cd5c08e..42432368 100644
--- a/changelog.rst
+++ b/changelog.rst
@@ -1,9 +1,14 @@
 Upcoming
 ========
 
+TODO
+
+1.8.2
+=====
+
 Internal changes:
 -----------------
-* Use temporary dir as config location in tests
+* Use temporary dir as config location in tests. (Thanks: `Dmitry B`_)
 * Fix errors in the ``tee`` test (#795 and #797). (Thanks: `Irina Truong`_)
 * Increase timeout for quitting pgcli. (Thanks: `Dick Marinus`_)
 
@@ -756,3 +761,4 @@ Improvements:
 .. _`Gustavo Castro`: https://github.com/gustavo-castro
 .. _`Alexander Schmolck`: https://github.com/aschmolck
 .. _`Andrew Speed`: https://github.com/AndrewSpeed
+.. _`Dmitry B`: https://github.com/oxitnik
diff --git a/setup.py b/setup.py
index d8ecb182..ed1f8bac 100644
--- a/setup.py
+++ b/setup.py
@@ -53,6 +53,7 @@ setup(
         'License :: OSI Approved :: BSD License',
         'Operating System :: Unix',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',