diff --git a/README.md b/README.md
index dfa83a8..f53bbe3 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@ httpbin(1): HTTP Request & Response Service
 ===========================================
 
 Freely hosted in [HTTP](http://httpbin.org) &
-[HTTPS](https://httpbin.herokuapp.com/) flavors by
+[HTTPS](https://httpbin.herokuapp.com/) flavors, thanks to
 [Heroku](http://heroku.com/).
 
 ## ENDPOINTS
@@ -57,7 +57,7 @@ All endpoint responses are JSON-encoded.
           "Host": "httpbin.org",
           "User-Agent": "curl/7.19.7 (universal-apple-darwin10.0) libcurl/7.19.7 OpenSSL/0.9.8l zlib/1.2.3"
        },
-       "origin": "::ffff:24.127.96.129",
+       "origin": "24.127.96.129",
        "url": "http://httpbin.org/get"
     }
 
@@ -78,4 +78,4 @@ Project.
 
 ## SEE ALSO
 
-<https://github.com/kennethreitz/httpbin>, <http://python-requests.org>
+<http://python-requests.org>
diff --git a/httpbin/templates/httpbin.1.html b/httpbin/templates/httpbin.1.html
index 2cfdbd4..0093281 100644
--- a/httpbin/templates/httpbin.1.html
+++ b/httpbin/templates/httpbin.1.html
@@ -1,7 +1,7 @@
 <div class='mp'>
 <h1>httpbin(1): HTTP Request &amp; Response Service</h1>
 <p>Freely hosted in <a href="http://httpbin.org">HTTP</a> &amp;
-<a href="https://httpbin.herokuapp.com/">HTTPS</a> flavors by
+<a href="https://httpbin.herokuapp.com/">HTTPS</a> flavors, thanks to
 <a href="http://heroku.com/">Heroku</a>.</p>
 
 <h2 id="ENDPOINTS">ENDPOINTS</h2>
@@ -59,7 +59,7 @@ scenarios. Additional endpoints are being considered (e.g. <code>/deflate</code>
       "Host": "httpbin.org",
       "User-Agent": "curl/7.19.7 (universal-apple-darwin10.0) libcurl/7.19.7 OpenSSL/0.9.8l zlib/1.2.3"
    },
-   "origin": "::ffff:24.127.96.129",
+   "origin": "24.127.96.129",
    "url": "http://httpbin.org/get"
 }
 </code></pre>
@@ -81,6 +81,6 @@ Project.</p>
 
 <h2 id="SEE-ALSO">SEE ALSO</h2>
 
-<p><a href="https://github.com/kennethreitz/httpbin" data-bare-link="true">https://github.com/kennethreitz/httpbin</a>, <a href="http://python-requests.org" data-bare-link="true">http://python-requests.org</a></p>
+<p><a href="http://python-requests.org" data-bare-link="true">http://python-requests.org</a></p>
 
 </div>