diff --git a/scrapy/trunk/docs/Makefile b/scrapy/trunk/docs/Makefile
index c6e4dd64d..0982644c7 100644
--- a/scrapy/trunk/docs/Makefile
+++ b/scrapy/trunk/docs/Makefile
@@ -3,6 +3,9 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 
+# Required for autodoc
+export SCRAPY_SETTINGS_DISABLED = 1
+
 # You can set these variables from the command line.
 PYTHON       = python
 SPHINXOPTS   =
diff --git a/scrapy/trunk/docs/conf.py b/scrapy/trunk/docs/conf.py
index cf5a98ae6..a7e14d28e 100644
--- a/scrapy/trunk/docs/conf.py
+++ b/scrapy/trunk/docs/conf.py
@@ -12,18 +12,21 @@
 # serve to show the default.
 
 import sys, os
+from os import path
 
 # If your extensions are in another directory, add it here. If the directory
 # is relative to the documentation root, use os.path.abspath to make it
 # absolute, like shown here.
-sys.path.append(os.path.join(os.path.dirname(__file__), "_ext"))
+sys.path.append(path.join(path.dirname(__file__), "_ext"))
+sys.path.append(path.join(path.dirname(path.dirname(__file__)), "scrapy"))
+
 
 # General configuration
 # ---------------------
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['scrapydocs']
+extensions = ['scrapydocs', 'sphinx.ext.autodoc']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['../templates/docs']