diff --git a/README.rst b/README.rst
index 7c7269dba..a2af9ec59 100644
--- a/README.rst
+++ b/README.rst
@@ -21,6 +21,10 @@ protocol) that can automate the tasks of obtaining certificates and
 configuring webservers to use them. This client runs on Unix-based operating
 systems.
 
+Until May 2016, Certbot was named simply ``letsencrypt`` or ``letsencrypt-auto``,
+depending on install method. Instructions on the Internet, and some pieces of the
+software, may still refer to this older name.
+
 Installation
 ------------
 
diff --git a/docs/contributing.rst b/docs/contributing.rst
index 9f7a7b3c3..60cc63e66 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -175,7 +175,7 @@ Configurators may implement just one of those).
 There are also `~certbot.interfaces.IDisplay` plugins,
 which implement bindings to alternative UI libraries.
 
-.. _interfaces.py: https://github.com/letsencrypt/letsencrypt/blob/master/letsencrypt/interfaces.py
+.. _interfaces.py: https://github.com/letsencrypt/letsencrypt/blob/master/certbot/interfaces.py
 .. _plugins/common.py: https://github.com/letsencrypt/letsencrypt/blob/master/letsencrypt/plugins/common.py#L34
 
 
diff --git a/docs/packaging.rst b/docs/packaging.rst
index bd366dbaa..5f09b65fa 100644
--- a/docs/packaging.rst
+++ b/docs/packaging.rst
@@ -3,4 +3,4 @@ Packaging Guide
 ===============
 
 Documentation can be found at
-https://github.com/certbot/certbot/wiki/Packaging.
+https://github.com/letsencrypt/letsencrypt/wiki/Packaging.
diff --git a/docs/using.rst b/docs/using.rst
index 07a3b6b6c..56ce78e80 100644
--- a/docs/using.rst
+++ b/docs/using.rst
@@ -27,7 +27,7 @@ To install and run the client, just type...
 
    ./certbot-auto
 
-.. hint:: During the beta phase, the Let's Encrypt servers enforce strict rate
+.. hint:: The Let's Encrypt servers enforce rate
    limits on the number of certificates issued for one domain. It is recommended
    to initially use the test server via `--test-cert` until you get the desired
    certificates.
@@ -144,7 +144,7 @@ made to your web server would look like:
 
 ::
 
-    66.133.109.36 - - [05/Jan/2016:20:11:24 -0500] "GET /.well-known/acme-challenge/HGr8U1IeTW4kY_Z6UIyaakzOkyQgPr_7ArlLgtZE8SX HTTP/1.1" 200 87 "-" "Mozilla/5.0 (compatible; Let's Encryptvalidation server; +https://www.letsencrypt.org)"
+    66.133.109.36 - - [05/Jan/2016:20:11:24 -0500] "GET /.well-known/acme-challenge/HGr8U1IeTW4kY_Z6UIyaakzOkyQgPr_7ArlLgtZE8SX HTTP/1.1" 200 87 "-" "Mozilla/5.0 (compatible; Let's Encrypt validation server; +https://www.letsencrypt.org)"
 
 Note that to use the webroot plugin, your server must be configured to serve
 files from hidden directories. If ``/.well-known`` is treated specially by
@@ -360,8 +360,9 @@ Getting help
 ============
 
 If you're having problems you can chat with us on `IRC (#certbot @
-OFTC) <https://webchat.oftc.net?channels=%23certbot>`_ or
-get support on our `forums <https://community.letsencrypt.org>`_.
+OFTC) <https://webchat.oftc.net?channels=%23certbot>`_ or at
+`IRC (#letsencrypt @ freenode) <https://webchat.freenode.net?channels=%23letsencrypt>`_
+or get support on our `forums <https://community.letsencrypt.org>`_.
 
 If you find a bug in the software, please do report it in our `issue
 tracker
@@ -420,7 +421,7 @@ Operating System Packages
 
 **FreeBSD**
 
-  * Port: ``cd /usr/ports/security/py-letsencrypt make install clean``
+  * Port: ``cd /usr/ports/security/py-letsencrypt && make install clean``
   * Package: ``pkg install py27-letsencrypt``
 
 **OpenBSD**