diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 34d5183fd229ca3a416d13da365b40b2c6f07a18..f6dd81a6776dba86f2f452c2cc7411264746c045 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,6 @@
 Zen 7.x-3.x-dev, xxxx-xx-xx (development release)
 ------------------------
+- #1044586: Fix "Rebuild theme registry" feature
 - #923382: Conditional stylesheets should use drupal_add_css()
 - #987916: Submitted by text doesn't use $submitted variable introduced in Drupal 7.0-rc1
 - #978810 by bellHead: Region-specific template suggestions for sidebar regions always use region--sidebar.tpl.php
diff --git a/template.php b/template.php
index 1fe36681cd2fbfe11c14340a3ca68d6a43da1264..c290f9a8dce1bb78094f6f223337c7a77da7a172 100644
--- a/template.php
+++ b/template.php
@@ -13,7 +13,10 @@
 
 // Auto-rebuild the theme registry during theme development.
 if (theme_get_setting('zen_rebuild_registry')) {
+  // Rebuild .info data.
   system_rebuild_theme_data();
+  // Rebuild theme registry.
+  drupal_theme_rebuild();
 }