diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c2e0bf389ba4..8602daa6fdec 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,8 @@
 
 Drupal 7.40, xxxx-xx-xx (development version)
 -----------------------
+- Allowed the user-picture.tpl.php theme template to have HTML classes besides
+  the default "user-picture" class printed in it (markup change).
 - Fixed the URL text filter to convert e-mail addresses with plus signs into
   mailto: links.
 - Added alternate text to file icons displayed by the File module, to improve
diff --git a/modules/user/user-picture.tpl.php b/modules/user/user-picture.tpl.php
index ee821878602f..11d92cc512be 100644
--- a/modules/user/user-picture.tpl.php
+++ b/modules/user/user-picture.tpl.php
@@ -17,7 +17,7 @@
  */
 ?>
 <?php if ($user_picture): ?>
-  <div class="user-picture">
+  <div class="<?php print $classes; ?>">
     <?php print $user_picture; ?>
   </div>
 <?php endif; ?>