diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 2a703b2749ad8b54f6f9f64859468b7789bdb7ec..19561d541faf846c86907f200105d806a819c932 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,9 @@
 
 Drupal 7.22, xxxx-xx-xx (development version)
 -----------------------
+- Fixed a serious documentation bug: The $name variable in the
+  taxonomy-term.tpl.php theme template was incorrectly documented as being
+  sanitized when in fact it is not.
 - Fixed a bug which prevented Drupal 6 to Drupal 7 upgrades on sites which had
   duplicate permission names in the User module's database tables.
 - Added an empty "datatype" attribute to taxonomy term and username links to
diff --git a/modules/taxonomy/taxonomy-term.tpl.php b/modules/taxonomy/taxonomy-term.tpl.php
index d410d1ef3bef3812dd1daf2cfe34a6aeca999119..a225c3a577128450699dc436798ffdcf259126e9 100644
--- a/modules/taxonomy/taxonomy-term.tpl.php
+++ b/modules/taxonomy/taxonomy-term.tpl.php
@@ -5,7 +5,8 @@
  * Default theme implementation to display a term.
  *
  * Available variables:
- * - $name: the (sanitized) name of the term.
+ * - $name: (deprecated) The unsanitized name of the term. Use $term_name
+ *   instead.
  * - $content: An array of items for the content of the term (fields and
  *   description). Use render($content) to print them all, or print a subset
  *   such as render($content['field_example']). Use