diff --git a/sites/scrapy.org/Makefile b/sites/scrapy.org/Makefile
index 75a2e7a3c..72f355f93 100644
--- a/sites/scrapy.org/Makefile
+++ b/sites/scrapy.org/Makefile
@@ -9,7 +9,7 @@ all : build tests
 build : docs
 
 docs :
-	sphinx-build -E -a -b pickle docs/scrapy-docs docs/pickle
+	sphinx-build -a -b pickle docs/scrapy-docs docs/pickle
 
 tests :
 	$(SETTINGS); \
diff --git a/sites/scrapy.org/scrapyorg/urls.py b/sites/scrapy.org/scrapyorg/urls.py
index eee390d48..8bfe30671 100644
--- a/sites/scrapy.org/scrapyorg/urls.py
+++ b/sites/scrapy.org/scrapyorg/urls.py
@@ -11,8 +11,13 @@ urlpatterns = patterns('',
     url(r"^admin/download/downloadlink/", include("scrapyorg.download.urls")),
     url(r'^admin/(.*)', admin.site.root),
 
+    # pablo: disabled documentation until we improve its usability. for now,
+    # documentation will be served at http://doc.scrapy.org using static html
+    # files generated by Sphinx, and a small notice landing page will be shown
+    # in scrapy.org/doc
     # docs
-    url(r"^docs/", include("scrapyorg.docs.urls")),
+#    url(r"^docs/", include("scrapyorg.docs.urls")),
+    url(r"docs/.*", 'django.views.generic.simple.redirect_to', {'url': '/doc/'}),
     # news
     url(r"^news/", include("scrapyorg.blog.urls")),
 )
@@ -29,3 +34,4 @@ if settings.DEBUG: # devel
 urlpatterns += patterns('',         
     url(r"", include("scrapyorg.article.urls")),
 )
+
diff --git a/sites/scrapy.org/templates/articles/doc.html b/sites/scrapy.org/templates/articles/doc.html
new file mode 100644
index 000000000..aa7c2d083
--- /dev/null
+++ b/sites/scrapy.org/templates/articles/doc.html
@@ -0,0 +1,17 @@
+{% extends "base_home.html" %}
+
+{% block main-content %}
+    <h1>Scrapy Documentation</h1>
+
+    <p>You can browse the Scrapy documentation online at:</p>
+
+    <p style="margin-left: 20px; font-size: larger;"><a href="http://doc.scrapy.org/">http://doc.scrapy.org</a></p>
+
+    <p>At the moment (January, 2009) our top priority is improving the
+    documentation so keep in mind that it will change and grow quite a bit
+    these days.</p>
+
+    <p>After we finish the documention we'll make it available in another
+    formats.</p>
+
+{% endblock %}
diff --git a/sites/scrapy.org/templates/articles/download.html b/sites/scrapy.org/templates/articles/download.html
index ab502db7c..c9e3a9b0b 100644
--- a/sites/scrapy.org/templates/articles/download.html
+++ b/sites/scrapy.org/templates/articles/download.html
@@ -41,7 +41,7 @@
 
     <h2>After you get it</h2>
 
-    <p>See the <a href="/docs/intro/install/">How to install Scrapy</a>
-    for further instructions
-    </p>
+    <p>Read the <a href="http://doc.scrapy.org/intro/install.html">Installation
+    steps</a> (in the documentation) for further instructions </p>
+
 {% endblock %}
diff --git a/sites/scrapy.org/templates/header.html b/sites/scrapy.org/templates/header.html
index 59dede326..c5baf7f96 100644
--- a/sites/scrapy.org/templates/header.html
+++ b/sites/scrapy.org/templates/header.html
@@ -4,7 +4,7 @@
   <ul id="navigation">
     <li><a href="/">Home</a></li>
     <li><a href="/download/">Download</a></li>
-    <li><a href="/docs/">Documentation</a></li>
+    <li><a href="/doc/">Documentation</a></li>
     <li><a href="/news/">News</a></li>
     <li><a href="/community/">Community</a></li>
     <li class="last"><a href="http://dev.scrapy.org">Development</a></li>