diff --git a/AUTHORS b/AUTHORS
index ba80d56195..0c1b017dc6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -341,6 +341,7 @@ answer newbie questions, and generally made Django that much better:
     john@calixto.net
     John D'Agostino <john.dagostino@gmail.com>
     John Huddleston <huddlej@wwu.edu>
+    John Moses <moses.john.r@gmail.com>
     John Paulett <john@paulett.org>
     John Shaffer <jshaffer2112@gmail.com>
     Jökull Sólberg Auðunsson <jokullsolberg@gmail.com>
diff --git a/docs/topics/forms/index.txt b/docs/topics/forms/index.txt
index 8133478e82..1a3f8c6dfa 100644
--- a/docs/topics/forms/index.txt
+++ b/docs/topics/forms/index.txt
@@ -635,6 +635,9 @@ loop:
         <div class="fieldWrapper">
             {{ field.errors }}
             {{ field.label_tag }} {{ field }}
+            {% if field.help_text %}
+            <p class="help">{{ field.help_text|safe }}</p>
+            {% endif %}
         </div>
     {% endfor %}