diff --git a/README.mkd b/README.mkd
index 972c7fe..538731a 100644
--- a/README.mkd
+++ b/README.mkd
@@ -4,15 +4,15 @@ __pathod__ is a collection of pathological tools for testing and torturing HTTP
 clients and servers. The project has three components:
 
 - __pathod__, an pathological HTTP daemon.
-- __pathoc__, a perverse HTTP client. 
+- __pathoc__, a perverse HTTP client.
 - __libpathod.test__, an API for easily using __pathod__ and __pathoc__ in unit tests.
 
 
 # Documentation
 
 The pathod documentation is self-hosted. Just fire up pathod, like so:
-    
-    ./pathod 
+
+    ./pathod
 
 And then browse to:
 
@@ -20,20 +20,20 @@ And then browse to:
 
 You can aways view the documentation for the latest release at the pathod
 website:
-    
+
     http://pathod.net
 
 # Installing
 
 If you already have __pip__ on your system, installing __pathod__ and its
 dependencies is dead simple:
-    
+
     pip install pathod
 
 The project has the following dependencies:
 
-* [netlib](http://github.com/cortesi/netlib)
-* [requests](http://docs.python-requests.org/en/latest/index.html) 
+* [netlib](https://github.com/mitmproxy/netlib)
+* [requests](http://docs.python-requests.org/en/latest/index.html)
 
 The project's test suite uses the
 [nose](http://nose.readthedocs.org/en/latest/) unit testing framework.
diff --git a/README.txt b/README.txt
index c531b93..9f13f06 100644
--- a/README.txt
+++ b/README.txt
@@ -38,6 +38,6 @@ The project has the following dependencies:
 
 The project's test suite uses the nose_ unit testing framework.
 
-.. _netlib: http://github.com/cortesi/netlib
+.. _netlib: https://github.com/mitmproxy/netlib
 .. _requests: http://docs.python-requests.org/en/latest/index.html 
 .. _nose: http://nose.readthedocs.org/en/latest/ 
diff --git a/libpathod/templates/docs_pathod.html b/libpathod/templates/docs_pathod.html
index d0e6ec8..3ad4dac 100644
--- a/libpathod/templates/docs_pathod.html
+++ b/libpathod/templates/docs_pathod.html
@@ -1,5 +1,5 @@
 {% extends "docframe.html" %}
-{% block body %}  
+{% block body %}
 
 <div class="page-header">
    <h1>
@@ -76,7 +76,7 @@ <h1>Anchors</h1>
 
 <pre class="terminal">./pathod -a "/foo=200"</pre>
 
-<p>Here, "/foo" is ithe regex specifying the anchor path, and the part after
+<p>Here, "/foo" is the regex specifying the anchor path, and the part after
 the "=" is a response specifier.</p>
 
 </section>
@@ -161,4 +161,4 @@ <h1>API</h1>
     </table>
 </section>
 
-{% endblock %}  
+{% endblock %}
diff --git a/libpathod/templates/download.html b/libpathod/templates/download.html
index e58437e..2f6ed28 100644
--- a/libpathod/templates/download.html
+++ b/libpathod/templates/download.html
@@ -1,5 +1,5 @@
 {% extends "frame.html" %}
-{% block body %}  
+{% block body %}
 
 <section>
     <div class="page-header">
@@ -28,11 +28,11 @@ <h1>
     <p> You can find the project source on GitHub: </p>
 
     <div style="margin-top: 20px; margin-bottom: 20px">
-    <a class="btn btn-primary btn-large" href="https://github.com/cortesi/pathod">github.com/cortesi/pathod</a>
+    <a class="btn btn-primary btn-large" href="https://github.com/mitmproxy/pathod">github.com/mitmproxy/pathod</a>
     </div>
 
     <p>Please also use the <a
-    href="https://github.com/cortesi/pathod/issues">github issue tracker</a> to
+    href="https://github.com/mitmproxy/pathod/issues">github issue tracker</a> to
     report bugs. </p>
 </section>
 
@@ -45,9 +45,9 @@ <h1>
     </div>
 
     <div style="margin-top: 20px; margin-bottom: 20px">
-    <a class="btn btn-primary btn-large" href="https://github.com/downloads/cortesi/pathod/pathod-{{version}}.tar.gz">pathod-{{version}}.tar.gz</a>
+    <a class="btn btn-primary btn-large" href="https://github.com/downloads/mitmproxy/pathod/pathod-{{version}}.tar.gz">pathod-{{version}}.tar.gz</a>
     </div>
 </section>
 
 
-{% endblock %}  
+{% endblock %}
diff --git a/libpathod/templates/index.html b/libpathod/templates/index.html
index 337f361..06a42de 100644
--- a/libpathod/templates/index.html
+++ b/libpathod/templates/index.html
@@ -1,5 +1,5 @@
 {% extends "frame.html" %}
-{% block body %}  
+{% block body %}
 
 
 <div class="masthead">
@@ -58,7 +58,7 @@ <h2>source</h2>
             <ul>
                 <li>Current release: <a href="http://mitmproxy.org/download/pathod-{{version}}.tar.gz">pathod {{version}}</a></li>
 
-                <li>GitHub: <a href="http://github.com/mitmproxy/pathod">github.com/cortesi/pathod</a></li>
+                <li>GitHub: <a href="https://github.com/mitmproxy/pathod">github.com/mitmproxy/pathod</a></li>
             </li>
         </div>
     </div>
@@ -66,4 +66,4 @@ <h2>source</h2>
 </section>
 
 
-{% endblock %}  
+{% endblock %}