diff --git a/docs/server/source/conf.py b/docs/server/source/conf.py
index 640e3273..ab9531fd 100644
--- a/docs/server/source/conf.py
+++ b/docs/server/source/conf.py
@@ -41,7 +41,7 @@ extensions = [
     'sphinx.ext.intersphinx',
     'sphinx.ext.coverage',
     'sphinx.ext.viewcode',
-    'sphinxcontrib.napoleon',
+    'sphinx.ext.napoleon',
     'sphinxcontrib.httpdomain',
 ]
 
diff --git a/setup.py b/setup.py
index 7878a9be..70b47a78 100644
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,6 @@ docs_require = [
     'Sphinx>=1.3.5',
     'recommonmark>=0.4.0',
     'sphinx-rtd-theme>=0.1.9',
-    'sphinxcontrib-napoleon>=0.4.4',
     'sphinxcontrib-httpdomain>=1.5.0',
 ]