diff --git a/docs/_templates/sidebarintro.html b/docs/_templates/sidebarintro.html
index 470ce04..a87a69a 100644
--- a/docs/_templates/sidebarintro.html
+++ b/docs/_templates/sidebarintro.html
@@ -1,4 +1,4 @@
-<h3><a href="http://tablib.org">About Tablib</a></h3>
+<h3><a href="http://docs.python-tablib.org">About Tablib</a></h3>
 <p>
   Tablib is an MIT Licensed format-agnostic tabular dataset library, written in Python. It allows you to import, export, and manipulate tabular data sets. Advanced features include, segregation, dynamic columns, tags & filtering, and seamless format import & export.
 </p>
@@ -13,7 +13,7 @@
 
 <h3>Useful Links</h3>
 <ul>
-  <li><a href="http://tablib.org/">The Tablib Website</a></li>
+  <li><a href="http://docs.python-tablib.org/">The Tablib Website</a></li>
   <li><a href="http://pypi.python.org/pypi/tablib">Tablib @ PyPI</a></li>
   <li><a href="http://github.com/kennethreitz/tablib">Tablib @ GitHub</a></li>
   <li><a href="http://github.com/kennethreitz/tablib/issues">Issue Tracker</a></li>
diff --git a/docs/development.rst b/docs/development.rst
index 0d6d455..a9ac0a4 100644
--- a/docs/development.rst
+++ b/docs/development.rst
@@ -67,7 +67,7 @@ Feature / Hotfix / Release branches follow a `Successful Git Branching Model`_ .
 ``master``
     Current production release (|version|) on PyPi.
 ``gh-pages``
-    Current release of http://tablib.org.
+    Current release of http://docs.python-tablib.org.
 
 Each release is tagged.
 
diff --git a/docs/index.rst b/docs/index.rst
index d010df5..482cc6d 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -55,7 +55,7 @@ and `The Sunlight Foundation <http://sunlightfoundation.com/>`_ use Tablib inter
    Tablib by @kennethreitz saved my life. I had to consolidate like 5 huge poorly maintained lists of domains and data. It was a breeze!
 
 **Dave Coutts**
-   It's turning into one of my most used modules of 2010. You really hit a sweat spot for managing tabular data with a minimal amount of code and effort.
+   It's turning into one of my most used modules of 2010. You really hit a sweet spot for managing tabular data with a minimal amount of code and effort.
 
 **Joshua Ourisman**
    Tablib has made it so much easier to deal with the inevitable 'I want an Excel file!' requests from clients...