diff --git a/docs/requirements.txt b/docs/requirements.txt
index ee51c14..56e9722 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,3 +1,2 @@
-numpydoc
 -e .
 ipykernel
diff --git a/docs/source/conf.py b/docs/source/conf.py
index f0afd8a..9b93a84 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -60,7 +60,7 @@ extensions = [
     'sphinx.ext.intersphinx',
     'IPython.sphinxext.ipython_console_highlighting',
     'IPython.sphinxext.ipython_directive',
-    'numpydoc',  # to preprocess docstrings
+    'sphinx.ext.napoleon',  # to preprocess docstrings
     'github',  # for easy GitHub links
     'magics',
 ]
diff --git a/setup.py b/setup.py
index 0662a7f..69cca42 100755
--- a/setup.py
+++ b/setup.py
@@ -182,7 +182,7 @@ setuptools_extra_args = {}
 extras_require = dict(
     parallel = ['ipyparallel'],
     qtconsole = ['qtconsole'],
-    doc = ['Sphinx>=1.1', 'numpydoc'],
+    doc = ['Sphinx>=1.3'],
     test = ['nose>=0.10.1', 'requests', 'testpath'],
     terminal = [],
     kernel = ['ipykernel'],