diff --git a/CHANGES b/CHANGES
index 94f7002aa..2a9b9c3b8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 Release 0.6.2 (in development)
 ==============================
 
+* #172: The ``obj`` role now links to modules as promised.
+
 * #19: Tables now can have a "longtable" class, in order to get
   correctly broken into pages in LaTeX output.
 
diff --git a/sphinx/environment.py b/sphinx/environment.py
index 1229656a9..a93276e43 100644
--- a/sphinx/environment.py
+++ b/sphinx/environment.py
@@ -1270,7 +1270,8 @@ class BuildEnvironment:
                             newnode['refuri'] = builder.get_relative_uri(
                                 fromdocname, docname, typ) + '#' + labelid
                         newnode.append(contnode)
-                elif typ == 'mod':
+                elif typ == 'mod' or \
+                         typ == 'obj' and target in self.modules:
                     docname, synopsis, platform, deprecated = \
                         self.modules.get(target, ('','','', ''))
                     if not docname: