diff --git a/IPython/core/display.py b/IPython/core/display.py
index 61713cf..de403b1 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -28,6 +28,12 @@ from IPython.utils.py3compat import (string_types, cast_bytes_py2, cast_unicode,
 from IPython.testing.skipdoctest import skip_doctest
 from .displaypub import publish_display_data
 
+__all__ = ['display', 'display_pretty', 'display_html', 'display_markdown',
+'display_svg', 'display_png', 'display_jpeg', 'display_latex', 'display_json',
+'display_javascript', 'display_pdf', 'DisplayObject', 'TextDisplayObject',
+'Pretty', 'HTML', 'Markdown', 'Math', 'Latex', 'SVG', 'JSON', 'Javascript',
+'clear_output', 'set_matplotlib_formats', 'set_matplotlib_close']
+
 #-----------------------------------------------------------------------------
 # utility functions
 #-----------------------------------------------------------------------------
diff --git a/IPython/lib/display.py b/IPython/lib/display.py
index 0eef477..6799d5b 100644
--- a/IPython/lib/display.py
+++ b/IPython/lib/display.py
@@ -7,6 +7,9 @@ from os import walk, sep
 
 from IPython.core.display import DisplayObject
 
+__all__ = ['Audio', 'IFrame', 'YouTubeVideo', 'VimeoVideo', 'ScribdDocument',
+           'FileLink', 'FileLinks']
+
 
 class Audio(DisplayObject):
     """Create an audio object.
diff --git a/docs/autogen_api.py b/docs/autogen_api.py
index 323d4d4..71c7f78 100755
--- a/docs/autogen_api.py
+++ b/docs/autogen_api.py
@@ -38,6 +38,9 @@ if __name__ == '__main__':
                                         # These are exposed by nbformat.current
                                         r'\.nbformat\.convert',
                                         r'\.nbformat\.validator',
+                                        # These are exposed in display
+                                        r'\.core\.display',
+                                        r'\.lib\.display',
                                         ]
 
     # These modules import functions and classes from other places to expose
@@ -46,6 +49,7 @@ if __name__ == '__main__':
     # above.
     docwriter.names_from__all__.update({
         'IPython.nbformat.current',
+        'IPython.display',
     })
     
     # Now, generate the outputs