diff -r 4b6e6a77e501 Lib/inspect.py
--- a/Lib/inspect.py	Sat Oct 22 03:21:55 2016 +0000
+++ b/Lib/inspect.py	Sat Oct 22 15:25:48 2016 +0200
@@ -1140,6 +1140,8 @@
     return ArgInfo(args, varargs, varkw, frame.f_locals)
 
 def formatannotation(annotation, base_module=None):
+    if getattr(annotation, '__module__', None) == 'typing':
+        return repr(annotation).replace('typing.', '')
     if isinstance(annotation, type):
         if annotation.__module__ in ('builtins', base_module):
             return annotation.__qualname__
diff -r 4b6e6a77e501 Lib/test/test_pydoc.py
--- a/Lib/test/test_pydoc.py	Sat Oct 22 03:21:55 2016 +0000
+++ b/Lib/test/test_pydoc.py	Sat Oct 22 15:25:48 2016 +0200
@@ -15,6 +15,7 @@
 import test.support
 import time
 import types
+import typing
 import unittest
 import urllib.parse
 import xml.etree
@@ -820,6 +821,18 @@
         expected = 'C in module %s object' % __name__
         self.assertIn(expected, pydoc.render_doc(c))
 
+    def test_typing_pydoc(self):
+        def foo(data: typing.List[typing.Any],
+                x: int) -> typing.Iterator[typing.Tuple[int, typing.Any]]:
+            ...
+        T = typing.TypeVar('T')
+        class C(typing.Generic[T], typing.Mapping[int, str]): ...
+        self.assertEqual(pydoc.render_doc(foo).splitlines()[-1],
+                         'f\x08fo\x08oo\x08o(data:List[Any], x:int)'
+                         ' -> Iterator[Tuple[int, Any]]')
+        self.assertEqual(pydoc.render_doc(C).splitlines()[2],
+                         'class C\x08C(typing.Mapping)')
+
     def test_builtin(self):
         for name in ('str', 'str.translate', 'builtins.str',
                      'builtins.str.translate'):