diff --git a/README.rst b/README.rst
index 29a656d..31c7984 100644
--- a/README.rst
+++ b/README.rst
@@ -2,14 +2,13 @@ httpbin(1): HTTP Request & Response Service
 ===========================================
 
 Freely hosted in `HTTP <http://httpbin.org>`__,
-`HTTPS <https://httpbin.org>`__,
-`HTTP/2 <https://http2bin.org>`__ & `EU <http://eu.httpbin.org/>`__
-flavors by `Runscope <https://www.runscope.com/>`__
+`HTTPS <https://httpbin.org>`__, & `EU <http://eu.httpbin.org/>`__
+flavors by `Heroku <https://www.heroku.com/>`__
 
 |Deploy|_
 
 .. |Deploy| image:: https://www.herokucdn.com/deploy/button.svg
-.. _Deploy: https://heroku.com/deploy?template=https://github.com/runscope/httpbin
+.. _Deploy: https://heroku.com/deploy?template=https://github.com/kennethreitz/httpbin
 
 |Build Status|
 
@@ -244,5 +243,5 @@ SEE ALSO
 - http://requestb.in
 - http://python-requests.org
 
-.. |Build Status| image:: https://travis-ci.org/Runscope/httpbin.svg
+.. |Build Status| image:: https://travis-ci.org/kennethreitz/httpbin.svg
    :target: https://travis-ci.org/Runscope/httpbin
diff --git a/httpbin/templates/httpbin.1.html b/httpbin/templates/httpbin.1.html
index eb6f14f..4a338df 100644
--- a/httpbin/templates/httpbin.1.html
+++ b/httpbin/templates/httpbin.1.html
@@ -1,6 +1,6 @@
 <div class='mp'>
 <h1>httpbin(1): HTTP Request &amp; Response Service</h1>
-<p>Freely hosted in <a href="http://httpbin.org">HTTP</a>, <a href="https://httpbin.org">HTTPS</a>, <a href="https://http2bin.org">HTTP/2</a> &amp; <a href="http://eu.httpbin.org/">EU</a> flavors by <a href="https://www.heroku.com/">Heroku</a>.</p>
+<p>Freely hosted in <a href="http://httpbin.org">HTTP</a>, <a href="https://httpbin.org">HTTPS</a>, &amp; <a href="http://eu.httpbin.org/">EU</a> flavors by <a href="https://www.heroku.com/">Heroku</a>.</p>
 
 <h2 id="ENDPOINTS">ENDPOINTS</h2>