diff --git a/AUTHORS b/AUTHORS
index f5cb30bb9..f8b46f94c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -28,6 +28,7 @@ Eduardo Schettino
 Eric Siegerman
 Florian Bruhin
 Edison Gustavo Muenz
+Eric Hunsberger
 Floris Bruynooghe
 Graham Horler
 Grig Gheorghiu
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 7b24cd9e7..be33e4fb4 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -191,6 +191,10 @@ but here is a simple overview:
     $ git commit -a -m "<commit message>"
     $ git push -u
 
+   Make sure you add a CHANGELOG message, and add yourself to AUTHORS. If you
+   are unsure about either of these steps, submit your pull request and we'll
+   help you fix it up.
+
 #. Finally, submit a pull request through the GitHub website:
 
    .. image:: img/pullrequest.png