diff --git a/TODO.rst b/TODO.rst
index e50140b..61de3a5 100644
--- a/TODO.rst
+++ b/TODO.rst
@@ -8,4 +8,4 @@
     - virtualenv
     - webdev
     
-    
\ No newline at end of file
+.. todolist::    
\ No newline at end of file
diff --git a/docs/conf.py b/docs/conf.py
index bbc7e5e..93ebaec 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -25,7 +25,7 @@ sys.path.append(os.path.abspath('_themes'))
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.ifconfig']
+extensions = ['sphinx.ext.ifconfig', 'sphinx.ext.todo']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -258,3 +258,5 @@ epub_copyright = u'2010, Kenneth Reitz'
 
 # Allow duplicate toc entries.
 #epub_tocdup = True
+
+todo_include_todos = True
\ No newline at end of file
diff --git a/docs/starting/installation.rst b/docs/starting/installation.rst
index 4b8477c..2fa0334 100644
--- a/docs/starting/installation.rst
+++ b/docs/starting/installation.rst
@@ -11,9 +11,9 @@ Package Manager
 
 While Snow Leopard comes with a large number of UNIX utilities, those
 familiar with Linux systems will notice one key component missing: a
-package manager. Mxcl's *Homebrew* is the answer.
+package manager. Mxcl's `Homebrew <http://mxcl.github.com/homebrew/>`_ is the answer.
 
-To install Homebrew, simply run: ::
+To `install Homebrew <https://github.com/mxcl/homebrew/wiki/installation>`_, simply run: ::
 
     $ ruby -e "$(curl -fsS http://gist.github.com/raw/323731/install_homebrew.rb)"
 
@@ -34,11 +34,10 @@ bugs.
 
 *Don't forget to update your environment PATH.*
 
-
 Building From Source
 --------------------
 
-
+.. todo:: Write "Building From Source"
 
 
 Distribute & Pip