diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1298090aa..028049ed7 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -86,7 +86,8 @@ Changes:
 
 Fixes:
 
-* Pin jellyfish requirement to version 0.6.0 to maintain python 2 compatibility.
+* On Python 2, pin the Jellyfish requirement to version 0.6.0 for
+  compatibility.
 * A new importer option, :ref:`ignore_data_tracks`, lets you skip audio tracks
   contained in data files :bug:`3021`
 * Restore iTunes Store album art source, and remove the dependency on
diff --git a/setup.py b/setup.py
index 19efb9451..648e6d4d4 100755
--- a/setup.py
+++ b/setup.py
@@ -92,9 +92,16 @@ setup(
         'unidecode',
         'musicbrainzngs>=0.4',
         'pyyaml',
-        'jellyfish==0.6.0',
-    ] + (['colorama'] if (sys.platform == 'win32') else []) +
-        (['enum34>=1.0.4'] if sys.version_info < (3, 4, 0) else []),
+    ] + (
+        # Use the backport of Python 3.4's `enum` module.
+        ['enum34>=1.0.4'] if sys.version_info < (3, 4, 0) else []
+    ) + (
+        # Pin a Python 2-compatible version of Jellyfish.
+        ['jellyfish==0.6.0'] if sys.version_info < (3, 4, 0) else ['jellyfish']
+    ) + (
+        # Support for ANSI console colors on Windows.
+        ['colorama'] if (sys.platform == 'win32') else []
+    ),
 
     tests_require=[
         'beautifulsoup4',