diff --git a/libpathod/templates/index.html b/libpathod/templates/index.html
index 074f91f2d..35d3756a5 100644
--- a/libpathod/templates/index.html
+++ b/libpathod/templates/index.html
@@ -56,7 +56,7 @@
             <h2>source</h2>
 
             <ul>
-                <li>Current release: <a href="">pathod 0.9</a></li>
+                <li>Current release: <a href="http://mitmproxy.org/download/pathod-0.9.tar.gz">pathod 0.9</a></li>
 
                 <li>GitHub: <a href="http://github.com/cortesi/pathod">github.com/cortesi/pathod</a></li>
             </li>
diff --git a/libpathod/templates/layout.html b/libpathod/templates/layout.html
index 5a6bd3ef7..3c0c477b6 100644
--- a/libpathod/templates/layout.html
+++ b/libpathod/templates/layout.html
@@ -56,7 +56,7 @@
       <hr>
       <footer>
         <span>&copy; Aldo Cortesi 2012</span>
-        <span class="pull-right">[served by pathod]</span>
+        <span class="pull-right">[served with pathod]</span>
       </footer>
     </div>
   </body>
diff --git a/pathoc b/pathoc
index aa3d5beda..739f5659c 100755
--- a/pathoc
+++ b/pathoc
@@ -17,6 +17,7 @@ if __name__ == "__main__":
         sys.exit(0)
 
     parser = argparse.ArgumentParser(description='A perverse HTTP client.', parents=[preparser])
+    parser.add_argument('--version', action='version', version="pathoc " + version.VERSION)
     parser.add_argument(
         "-c", dest="connect_to", type=str, default=False,
         metavar = "HOST:PORT",
diff --git a/pathod b/pathod
index 29f59193a..60ade46ec 100755
--- a/pathod
+++ b/pathod
@@ -108,6 +108,7 @@ def main(parser, args):
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description='A pathological HTTP/S daemon.')
+    parser.add_argument('--version', action='version', version="pathod " + version.VERSION)
     parser.add_argument("-p", dest='port', default=9999, type=int, help='Port. Specify 0 to pick an arbitrary empty port.')
     parser.add_argument("-l", dest='address', default="127.0.0.1", type=str, help='Listening address.')
     parser.add_argument(