diff --git a/setup.py b/setup.py
index 18c92ad37..8d59fa093 100755
--- a/setup.py
+++ b/setup.py
@@ -278,6 +278,7 @@ if 'setuptools' in sys.modules:
         doc = 'Sphinx>=0.3',
         test = 'nose>=0.10.1',
         notebook = ['tornado>=2.0', 'pyzmq>=2.1.11', 'jinja2'],
+        nbconvert = ['pygments', 'markdown', 'jinja2', 'Sphinx>=0.3']
     )
     requires = setup_args.setdefault('install_requires', [])
     setupext.display_status = False
diff --git a/setupbase.py b/setupbase.py
index fee8dc8ef..ed8bad651 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -151,6 +151,8 @@ def find_package_data():
         'IPython.testing.plugin' : ['*.txt'],
         'IPython.html' : ['templates/*'] + static_data,
         'IPython.qt.console' : ['resources/icon/*.svg'],
+        'IPython.nbconvert.templates' : ['*.tpl', 'latex/*.tpl',
+            'latex/skeleton/*.tplx', 'skeleton/*']
     }
     return package_data
 
@@ -320,7 +322,7 @@ def find_scripts(entry_points=False, suffix=''):
             'iplogger%s = IPython.parallel.apps.iploggerapp:launch_new_instance',
             'ipcluster%s = IPython.parallel.apps.ipclusterapp:launch_new_instance',
             'iptest%s = IPython.testing.iptest:main',
-            'irunner%s = IPython.lib.irunner:main'
+            'irunner%s = IPython.lib.irunner:main',
         ]]
         gui_scripts = []
         scripts = dict(console_scripts=console_scripts, gui_scripts=gui_scripts)
@@ -370,6 +372,8 @@ def check_for_dependencies():
     check_for_pexpect()
     check_for_pyzmq()
     check_for_readline()
+    check_for_jinja2()
+    check_for_markdown()
 
 #---------------------------------------------------------------------------
 # VCS related