diff --git a/CHANGES b/CHANGES
index 72cf4e9de..66d4690aa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -171,6 +171,7 @@ Bugs fixed
 * PR#297, #1571: Add imgpath property to all builders. It make easier to
   develop builder extensions. Thanks to Takeshi Komiya.
 * #1584: Point to master doc in HTML "top" link.
+* #1585: Autosummary of modules broken in Sphinx-1.2.3.
 
 Documentation
 -------------
diff --git a/sphinx/ext/autosummary/__init__.py b/sphinx/ext/autosummary/__init__.py
index c40ba91d6..908c96ca0 100644
--- a/sphinx/ext/autosummary/__init__.py
+++ b/sphinx/ext/autosummary/__init__.py
@@ -58,6 +58,7 @@ import re
 import sys
 import inspect
 import posixpath
+from types import ModuleType
 
 from six import text_type
 from docutils.parsers.rst import directives
@@ -253,7 +254,7 @@ class Autosummary(Directive):
 
             self.result = ViewList()  # initialize for each documenter
             full_name = real_name
-            if full_name.startswith(modname + '.'):
+            if not isinstance(obj, ModuleType):
                 # give explicitly separated module name, so that members
                 # of inner classes can be documented
                 full_name = modname + '::' + full_name[len(modname)+1:]