diff --git a/debian/changelog b/debian/changelog
index 25fac8e7fccab81f7c28d8661126aa9d4c6d1f00..977389a7caeac172f69d0be4612fb86e422e3d11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ python-defaults (2.7.2-5) UNRELEASED; urgency=low
       other packages, which do not use a helper/bytecompile them)
     - add --no-dbg-cleaning option (to disable removing files from debug
       packages)
+    - fix handling "distname[features]" in debpython.pydist.guess_dependency
+      (closes: 636255)
   * pyclean now accepts --package and private dir argument at the same time
 
   [ Scott Kitterman ]
diff --git a/debpython/pydist.py b/debpython/pydist.py
index 154bca075cbf072b78d39e132d93175e44db3c86..5b9bc1241bc35bdd25794b2aec4bfec99c1a2735 100644
--- a/debpython/pydist.py
+++ b/debpython/pydist.py
@@ -127,7 +127,8 @@ def guess_dependency(req, version=None):
                  'or your upstream author to fix requires.txt')
         exit(8)
     req_dict = req_dict.groupdict()
-    details = data.get(req_dict['name'].lower())
+    name = req_dict['name']  # drop "[features]"
+    details = data.get(name.lower())
     if details:
         for item in details:
             if version and version not in item.get('versions', version):