diff --git a/bob/buildout/scripts.py b/bob/buildout/scripts.py
index 8c7fc250f1deb02f42f26fdb8044cbdd9ceaa8ae..3ec7d2c238548251bbbf757309f665dd468d7548 100644
--- a/bob/buildout/scripts.py
+++ b/bob/buildout/scripts.py
@@ -188,10 +188,10 @@ class Sphinx(Script):
       'sphinx-quickstart',
       ])
     self.options['entry-points'] = '\n'.join([
-      'sphinx-build=sphinx:main',
-      'sphinx-apidoc=sphinx.apidoc:main',
+      'sphinx-build=sphinx.cmd.build:main',
+      'sphinx-apidoc=sphinx.ext.apidoc:main',
       'sphinx-autogen=sphinx.ext.autosummary.generate:main',
-      'sphinx-quickstart=sphinx.quickstart:main',
+      'sphinx-quickstart=sphinx.cmd.quickstart:main',
       ])
     self.options['dependent-scripts'] = 'false'