diff --git a/sites/scrapy.org/docs/sources/_ext/scrapydocs.py b/scrapy/trunk/docs/_ext/scrapydocs.py
similarity index 100%
rename from sites/scrapy.org/docs/sources/_ext/scrapydocs.py
rename to scrapy/trunk/docs/_ext/scrapydocs.py
diff --git a/sites/scrapy.org/docs/sources/conf.py b/scrapy/trunk/docs/conf.py
similarity index 100%
rename from sites/scrapy.org/docs/sources/conf.py
rename to scrapy/trunk/docs/conf.py
diff --git a/sites/scrapy.org/docs/sources/index.rst b/scrapy/trunk/docs/index.rst
similarity index 100%
rename from sites/scrapy.org/docs/sources/index.rst
rename to scrapy/trunk/docs/index.rst
diff --git a/sites/scrapy.org/docs/sources/intro/index.rst b/scrapy/trunk/docs/intro/index.rst
similarity index 100%
rename from sites/scrapy.org/docs/sources/intro/index.rst
rename to scrapy/trunk/docs/intro/index.rst
diff --git a/sites/scrapy.org/docs/sources/intro/install.rst b/scrapy/trunk/docs/intro/install.rst
similarity index 100%
rename from sites/scrapy.org/docs/sources/intro/install.rst
rename to scrapy/trunk/docs/intro/install.rst
diff --git a/sites/scrapy.org/docs/sources/intro/overview/overview.rst b/scrapy/trunk/docs/intro/overview/overview.rst
similarity index 100%
rename from sites/scrapy.org/docs/sources/intro/overview/overview.rst
rename to scrapy/trunk/docs/intro/overview/overview.rst
diff --git a/sites/scrapy.org/docs/sources/intro/overview/selectors.rst b/scrapy/trunk/docs/intro/overview/selectors.rst
similarity index 100%
rename from sites/scrapy.org/docs/sources/intro/overview/selectors.rst
rename to scrapy/trunk/docs/intro/overview/selectors.rst
diff --git a/sites/scrapy.org/docs/sources/intro/overview/spiders.rst b/scrapy/trunk/docs/intro/overview/spiders.rst
similarity index 100%
rename from sites/scrapy.org/docs/sources/intro/overview/spiders.rst
rename to scrapy/trunk/docs/intro/overview/spiders.rst
diff --git a/sites/scrapy.org/docs/sources/reference/index.rst b/scrapy/trunk/docs/reference/index.rst
similarity index 100%
rename from sites/scrapy.org/docs/sources/reference/index.rst
rename to scrapy/trunk/docs/reference/index.rst
diff --git a/sites/scrapy.org/docs/sources/reference/settings.rst b/scrapy/trunk/docs/reference/settings.rst
similarity index 100%
rename from sites/scrapy.org/docs/sources/reference/settings.rst
rename to scrapy/trunk/docs/reference/settings.rst
diff --git a/sites/scrapy.org/docs/sources/tutorial/index.rst b/scrapy/trunk/docs/tutorial/index.rst
similarity index 100%
rename from sites/scrapy.org/docs/sources/tutorial/index.rst
rename to scrapy/trunk/docs/tutorial/index.rst
diff --git a/sites/scrapy.org/docs/sources/tutorial/scrot1.png b/scrapy/trunk/docs/tutorial/scrot1.png
similarity index 100%
rename from sites/scrapy.org/docs/sources/tutorial/scrot1.png
rename to scrapy/trunk/docs/tutorial/scrot1.png
diff --git a/sites/scrapy.org/docs/sources/tutorial/scrot2.png b/scrapy/trunk/docs/tutorial/scrot2.png
similarity index 100%
rename from sites/scrapy.org/docs/sources/tutorial/scrot2.png
rename to scrapy/trunk/docs/tutorial/scrot2.png
diff --git a/sites/scrapy.org/docs/sources/tutorial/scrot3.png b/scrapy/trunk/docs/tutorial/scrot3.png
similarity index 100%
rename from sites/scrapy.org/docs/sources/tutorial/scrot3.png
rename to scrapy/trunk/docs/tutorial/scrot3.png
diff --git a/sites/scrapy.org/docs/sources/tutorial/tutorial1.rst b/scrapy/trunk/docs/tutorial/tutorial1.rst
similarity index 100%
rename from sites/scrapy.org/docs/sources/tutorial/tutorial1.rst
rename to scrapy/trunk/docs/tutorial/tutorial1.rst
diff --git a/sites/scrapy.org/docs/sources/tutorial/tutorial2.rst b/scrapy/trunk/docs/tutorial/tutorial2.rst
similarity index 100%
rename from sites/scrapy.org/docs/sources/tutorial/tutorial2.rst
rename to scrapy/trunk/docs/tutorial/tutorial2.rst
diff --git a/sites/scrapy.org/docs/sources/tutorial/tutorial3.rst b/scrapy/trunk/docs/tutorial/tutorial3.rst
similarity index 100%
rename from sites/scrapy.org/docs/sources/tutorial/tutorial3.rst
rename to scrapy/trunk/docs/tutorial/tutorial3.rst
diff --git a/sites/scrapy.org/docs/sources/tutorial/tutorial4.rst b/scrapy/trunk/docs/tutorial/tutorial4.rst
similarity index 100%
rename from sites/scrapy.org/docs/sources/tutorial/tutorial4.rst
rename to scrapy/trunk/docs/tutorial/tutorial4.rst
diff --git a/sites/scrapy.org/Makefile b/sites/scrapy.org/Makefile
index 9a5981741..72f355f93 100644
--- a/sites/scrapy.org/Makefile
+++ b/sites/scrapy.org/Makefile
@@ -9,7 +9,7 @@ all : build tests
 build : docs
 
 docs :
-	sphinx-build -a -b pickle docs/sources docs/pickle
+	sphinx-build -a -b pickle docs/scrapy-docs docs/pickle
 
 tests :
 	$(SETTINGS); \