diff --git a/doc/make.bat b/doc/make.bat
index 3d35ac01..40a74901 100644
--- a/doc/make.bat
+++ b/doc/make.bat
@@ -13,11 +13,6 @@ if NOT "%PAPER%" == "" (
 	set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
 )
 
-
-echo "Sphinx details"
-echo "%SPHINXBUILD%"
-echo "%ALLSPHINXOPTS%"
-
 if "%1" == "" goto help
 
 if "%1" == "help" (
diff --git a/setup.py b/setup.py
index ed81250e..432b8b13 100644
--- a/setup.py
+++ b/setup.py
@@ -3,6 +3,7 @@
 
 import os
 from numpy.distutils.core import Extension, setup
+from sphinx.setup_command import BuildDoc
 
 # Version number
 version = '0.1.3'
@@ -25,8 +26,9 @@ setup(name = 'GPy',
       long_description=read('README.md'),
       #ext_modules =  [Extension(name = 'GPy.kern.lfmUpsilonf2py',
       #          sources = ['GPy/kern/src/lfmUpsilonf2py.f90'])],
-      install_requires=['sympy', 'numpy>=1.6', 'scipy>=0.9', 'matplotlib>=1.1'],
-      setup_requires=['sphinx>=1.1.3'],
+      install_requires=['sympy', 'numpy>=1.6', 'scipy>=0.9','matplotlib>=1.1'],
+      setup_requires=['sphinx'],
+      cmdclass = {'build_sphinx': BuildDoc},
       classifiers=[
       "Development Status :: 1 - Alpha",
       "Topic :: Machine Learning",