diff --git a/sites/scrapy.org/templates/articles/community.html b/sites/scrapy.org/templates/articles/community.html
new file mode 100644
index 000000000..200f5dd2a
--- /dev/null
+++ b/sites/scrapy.org/templates/articles/community.html
@@ -0,0 +1,31 @@
+{% extends "base_home.html" %}
+
+{% block main-content %}
+    <h2>Mailing lists</h2>
+    <p>
+    <a href="http://groups.google.com/group/scrapy-users">scrapy-users</a>: The main list for help and announcements
+    </p>
+
+    <form action="http://groups.google.com/group/scrapy-users/boxsubscribe">
+    <p>Subscribe: <input type="text" size="15" name="email"/> <input type="submit" value="Go"/></p>
+    </form>
+
+    <p>
+<a href="http://groups.google.com/group/scrapy-developers">scrapy-developers</a>: Where discussions about Scrapy development itself takes place</a>
+    </p>
+
+    <form action="http://groups.google.com/group/scrapy-developers/boxsubscribe">
+    <p>Subscribe: <input type="text" size="15" name="email"/> <input type="submit" value="Go"/></p>
+    </form>
+
+    <h2>IRC</h2>
+
+    <ul>
+    <li><a href="irc://irc.freenode.net/scrapy">#scrapy IRC channel</a> - chat with other Scrapy users &amp; developers</a></li>
+    <li>
+    Scrapy is available under the <a class="reference" href="http://dev.scrapy.org/browser/scrapy/trunk/LICENSE">BSD license</a>.
+    It requires Python 2.5 and some other Python libraries (see Requirements below)</p>
+    </p>
+
+</div>
+{% endblock %}
diff --git a/sites/scrapy.org/templates/articles/download.html b/sites/scrapy.org/templates/articles/download.html
new file mode 100644
index 000000000..bf4579c75
--- /dev/null
+++ b/sites/scrapy.org/templates/articles/download.html
@@ -0,0 +1,51 @@
+{% extends "base_home.html" %}
+
+{% block main-content %}
+    <h2>How to get Scrapy</h2>
+
+    <p>
+    Scrapy is available under the <a class="reference" href="http://dev.scrapy.org/browser/scrapy/trunk/LICENSE">BSD license</a>.
+    It requires Python 2.5 and some other Python libraries (see Requirements below)</p>
+    </p>
+
+    <h2>Requirements</h2>
+
+    <ul>
+       <li>Python 2.5 (or 2.6)</li>
+       <li>Twisted 8.0 or above</li>
+       <li>libxml2 2.6.28 or above (including Python bidings)</li>
+    </ul>
+
+    <p>
+    The following libraries are also recommended:
+    </p>
+
+    <ul>
+       <li>pyopenssl - for crawling secure (HTTPS) pages</li>
+       <li>spidermonkey - for parsing javascript</li>
+    </ul>
+    
+    
+    <h2>Latest release</h2>
+
+    <p>
+    We're working hard to get the first release of Scrapy out. In the
+    meantime, please download the latest development version from the
+    Subversion repository.
+    </p>
+
+    <h2>Development version</h2>
+    
+    <p>You can get the latest (and more stable) release of Scrapy from the
+    Subversion repository at: <code>http://svn.scrapy.org/scrapy/trunk/</code>
+    </p>
+
+    <h2>After you get it</h2>
+
+    <p>
+    See the <a href="http://dev.scrapy.org/browser/scrapy/trunk/INSTALL">INSTALL</a> 
+    file for further instructions
+    </p>
+
+</div>
+{% endblock %}
diff --git a/sites/scrapy.org/templates/articles/home.html b/sites/scrapy.org/templates/articles/home.html
index bbc8a468f..20f26ea23 100644
--- a/sites/scrapy.org/templates/articles/home.html
+++ b/sites/scrapy.org/templates/articles/home.html
@@ -1,51 +1,24 @@
 {% extends "base_home.html" %}
 
 {% block main-content %}
-        <h2>Welcome to Scrapy</h2>
-
-        <blockquote>
-        Nullam ullamcorper, sem quis interdum imperdiet, velit leoconvallis ante, eget
-        fringilla lacus nisi non turpis. Proin at pede.
-        </blockquote>
-        
-        <p>
-        Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc at dolor
-        congue massa tincidunt placerat. Donec nulla lacus, euismod ac, ultrices vel,
-        sollicitudin et, nunc. Maecenas molestie. Aenean ut massa. Suspendisse placerat
-        augue sit amet leo. Quisque molestie consectetuer lacus. Nunc semper porttitor
-        ipsum. Fusce est. Pellentesque semper, urna eget luctus fermentum, elit est
-        consectetuer sapien, ut egestas ligula <a class="reference" href="http://google.com">mauris at lectus</a>.
-        Sed pellentesque consequat turpis. Mauris tempus neque vel urna. Pellentesque facilisis,
-        velit id viverra laoreet, lectus felis ultrices diam, nec semper nisl dui ac ante.
-        Etiam rhoncus, nibh vitae laoreet ultricies, dui nibh pulvinar eros, non tempor est
-        neque vel massa. Nulla imperdiet diam quis purus.
-        </p>
-
-        <p>
-        Nullam ullamcorper, sem quis interdum imperdiet, velit leo convallis ante, eget
-        fringilla lacus nisi non turpis. Proin at pede. Aliquam nunc erat, condimentum a,
-        molestie ut, ultrices in, augue. Mauris sodales. Mauris faucibus justo eget lacus.
-        Vivamus consectetuer, magna eget egestas tincidunt, lorem mauris feugiat nulla,
-        eget hendrerit arcu urna a nisl. Cras sem odio, iaculis non, tempus sed, congue vitae,
-        orci. Aliquam ut purus. Vivamus massa. Donec mattis congue magna. Pellentesque sem velit,
-        hendrerit vel, ultricies sit amet, dictum a, dolor. Mauris sed lacus. Pellentesque congue.
-        Vestibulum accumsan dui volutpat turpis. In hac habitasse platea dictumst. Vivamus
-        bibendum mi nec enim. Donec at leo. Phasellus convallis.
-        </p>
+    <h2>Welcome to Scrapy</h2>
 
+    <blockquote>
+    Scrapy is a high level scraping and web crawling framework for writing
+    spiders to crawl and parse web pages for all kinds of purposes, from
+    information retrieval to monitoring or testing web sites.
+    </blockquote>
     
-        <h2>Documentation</h2>
+    <p>
+    We're currently preparing the first official release of Scrapy with a
+    very stable API. At the moment we consider the API quite stable, and
+    we're writing documentation, tutorials and examples to make it easier
+    to start using it.
+    </p>
+
+    <p> 
+    Please start by reading <a href="/docs/">the documentation</a> and check
+    out the community resources where you can ask for further help while we
+    improve the documentation.</p>
 
-        <p>
-        Nullam ullamcorper, sem quis interdum imperdiet, velit leo convallis ante, eget fringilla
-        lacus nisi non turpis. Proin at pede. Aliquam nunc erat, condimentum a, molestie ut,
-        ultrices in, augue. Mauris sodales. Mauris faucibus justo eget lacus. Vivamus consectetuer,
-        magna eget egestas tincidunt, lorem mauris feugiat nulla, eget hendrerit arcu urna a nisl.
-        Cras sem odio, iaculis non, tempus sed, congue vitae, orci. Aliquam ut purus. Vivamus massa.
-        Donec mattis <a class="reference" href="http://scrapy.org">congue magna</a>. Pellentesque sem
-        velit, hendrerit vel, ultricies sit amet, dictum a, dolor. Mauris sed lacus. Pellentesque congue.
-        Vestibulum accumsan dui volutpat turpis. In hac habitasse platea dictumst. Vivamus bibendum mi nec
-        enim. Donec at leo. Phasellus convallis.
-        </p>
-    </div>
 {% endblock %}
diff --git a/sites/scrapy.org/templates/footer.html b/sites/scrapy.org/templates/footer.html
index 86845c931..e691582be 100644
--- a/sites/scrapy.org/templates/footer.html
+++ b/sites/scrapy.org/templates/footer.html
@@ -1,15 +1,14 @@
 <div id="footer">
   {% block footer %}
   <ul>
-    <li style="border-right:none;">Scrapy : </li>
     <li><a href="/">Home</a>
-    <li><a href="/code/">Code</a>
-    <li><a href="/blog/">Weblog</a>
+    <li><a href="/download/">Download</a>
     <li><a href="/doc/">Documentation</a>
-    <li class="last"><a href="/download/">Download</a>
+    <li><a href="/community/">Community</a>
+    <li><a href="http://dev.scrapy.org">Development</a>
+    <li class="last"><a href="/blog/">Blog</a>
   </ul>
   <div class="clear"></div>
-  <p>Got any feedback or suggestions? We're interested in hearing them! <a href="#">Contact us</a>!</p>
-  <p>&copy; 2008 <a href="http://insophia.com/">Insophia</a></p>
+  <p>&copy; 2007-2008 <a href="http://insophia.com/">Insophia</a>, <a href="http://mydeco.com/the-magazine/style/mydeco-about-us">By Design UK</a></p>
   {% endblock %}
 </div>
diff --git a/sites/scrapy.org/templates/header.html b/sites/scrapy.org/templates/header.html
index 65b5bb754..2d9dad862 100644
--- a/sites/scrapy.org/templates/header.html
+++ b/sites/scrapy.org/templates/header.html
@@ -1,10 +1,11 @@
 <div id="header">
-  <h1>Scrapy - an opensource screen scraping framework for python</h1>
+  <h1>Scrapy - a Python screen scraping &amp; web crawling framework</h1>
   <ul id="navigation">
     <li><a href="/">Home</a>
-    <li><a href="/code/">Code</a>
-    <li><a href="/blog/">Weblog</a>
+    <li><a href="/download/">Download</a>
     <li><a href="/docs/">Documentation</a>
-    <li class="last"><a href="/download/">Download</a>
+    <li><a href="/community/">Community</a>
+    <li><a href="http://dev.scrapy.org">Development</a>
+    <li class="last"><a href="/blog/">Blog</a>
   </ul>
 </div>