diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index bcb0bcc847..7f6fc30540 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -194,6 +194,7 @@ p a {
 		<li>[Fix] Hide autologin box when autologin is disabled (Bug #13093)</li>
 		<li>[Fix] Account for the forum id not being part of the request uri in prosilver (Bug #13121)</li>
 		<li>[Fix] Properly alter PostgreSQL tables</li>
+		<li>[Fix] Properly cache template files that were stored in the database (Bug #12675)</li>
 
 	</ul>
 
diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php
index 9095a31dba..f8db087d48 100644
--- a/phpBB/includes/template.php
+++ b/phpBB/includes/template.php
@@ -34,6 +34,7 @@ class template
 	var $root = '';
 	var $cachepath = '';
 	var $files = array();
+	var $filename = array();
 
 	// this will hash handle names to the compiled/uncompiled code for that handle.
 	var $compiled_code = array();
@@ -246,6 +247,7 @@ class template
 							$compile->_tpl_load_file($row['template_filename']);
 							unset($this->compiled_code[$row['template_filename']]);
 							unset($this->files[$row['template_filename']]);
+							unset($this->filename[$row['template_filename']]);
 						}
 					}