diff --git a/docs/packaging.rst b/docs/packaging.rst
index 6bf359bf2..6463e777d 100644
--- a/docs/packaging.rst
+++ b/docs/packaging.rst
@@ -8,39 +8,33 @@ Releases
 We release packages and upload them to PyPI (wheels and source tarballs).
 
 - https://pypi.python.org/pypi/acme
-- https://pypi.python.org/pypi/letsencrypt
-- https://pypi.python.org/pypi/letsencrypt-apache
-- https://pypi.python.org/pypi/letsencrypt-nginx
-- https://pypi.python.org/pypi/letshelp-letsencrypt
+- https://pypi.python.org/pypi/certbot
+- https://pypi.python.org/pypi/certbot-apache
+- https://pypi.python.org/pypi/certbot-nginx
 
 The following scripts are used in the process:
 
 - https://github.com/letsencrypt/letsencrypt/blob/master/tools/release.sh
-- https://gist.github.com/kuba/b9a3a2ca3bd35b8368ef
 
-We currently version as ``0.0.0.devYYYYMMDD``, and will change at GA time to the following scheme:
+We currently version with the following scheme:
 
 - ``0.1.0``
 - ``0.2.0dev`` for developement in ``master``
 - ``0.2.0`` (only temporarily in ``master``)
 - ...
 
-Tracking issue for non-dev release scripts: https://github.com/letsencrypt/letsencrypt/issues/1185
-
 Notes for package maintainers
 =============================
 
 0. Please use our releases, not ``master``!
 
-1. Do not package ``letsencrypt-compatibility-test`` - it's only used internally.
+1. Do not package ``certbot-compatibility-test`` or ``letshelp-certbot`` - it's only used internally.
 
-2. ``letsencrypt-renewer`` should be added to crontab... but it currently doesn't work well
+2. If you'd like to include automated renewal in your package ``certbot renew -q`` should be added to crontab.
 
-3. ``letsencrypt.client`` provides developer API so it should be possible to ``import letsencrypt.client`` when the package is installed (``letsencrypt`` vs ``python-letsencrypt`` debate for Debian).
+3. ``jws`` is an internal script for ``acme`` module and it doesn't have to be packaged - it's mostly for debugging: you can use it as ``echo foo | jws sign | jws verify``.
 
-4. ``jws`` is an internal script for ``acme`` module and it doesn't have to be packaged - it's mostly for debugging: you can use it as ``echo foo | jws sign | jws verify``.
-
-5. Do get in touch with us. We are happy to make any changes that will make packaging easier. If you need to apply some patches don't do it downstream - make a PR here.
+4. Do get in touch with us. We are happy to make any changes that will make packaging easier. If you need to apply some patches don't do it downstream - make a PR here.
 
 Already ongoing efforts
 =======================
@@ -51,17 +45,20 @@ Arch
 
 From PyPI:
 - https://www.archlinux.org/packages/community/any/python2-acme
-- https://www.archlinux.org/packages/community/any/letsencrypt
-- https://www.archlinux.org/packages/community/any/letsencrypt-apache
-- https://www.archlinux.org/packages/community/any/letsencrypt-nginx
-- https://www.archlinux.org/packages/community/any/letshelp-letsencrypt
+- https://www.archlinux.org/packages/community/any/certbot
+- https://www.archlinux.org/packages/community/any/certbot-apache
+- https://www.archlinux.org/packages/community/any/certbot-nginx
+- https://www.archlinux.org/packages/community/any/letshelp-certbot
 
-From ``master``: https://aur.archlinux.org/packages/letsencrypt-git
+From ``master``: https://aur.archlinux.org/packages/certbot-git
 
 Debian (and its derivatives, including Ubuntu)
 ------
 
 https://alioth.debian.org/projects/letsencrypt/
+https://packages.debian.org/sid/certbot
+https://packages.debian.org/sid/python-certbot
+https://packages.debian.org/sid/python-certbot-apache
 
 Fedora
 ------
@@ -69,8 +66,8 @@ Fedora
 In Fedora 23+.
 
 - https://admin.fedoraproject.org/pkgdb/package/letsencrypt/
+- https://admin.fedoraproject.org/pkgdb/package/certbot/
 - https://admin.fedoraproject.org/pkgdb/package/python-acme/
-- https://bugzilla.redhat.com/show_bug.cgi?id=1287193 (review request, closed)
 
 FreeBSD
 -------