diff --git a/NEWS b/NEWS
index 182f5607..490c0b0a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
-    - fixed bug in smarty_make_timestamp introduced in PHP 4.1.0 (Monte)
-    - fixed bug with cached insert debug timing (Monte)
+    - fixed a bug with incorrectly combined cache and compile id in
+      clear_cache(). (Andrei)
+    - fixed bug in smarty_make_timestamp introduced in PHP 4.1.0. (Monte)
+    - fixed bug with cached insert debug timing. (Monte)
     - added 'script' attribute to {insert..} which specifies the script that
       the insert function can be found in. (Andrei)
     - added default template function handler. (Monte)
diff --git a/Smarty.class.php b/Smarty.class.php
index 047f55fd..ddccb0a2 100644
--- a/Smarty.class.php
+++ b/Smarty.class.php
@@ -429,7 +429,7 @@ class Smarty
         if (!isset($compile_id))
             $compile_id = $this->compile_id;
 
-        if (isset($compile_id) && isset($cache_id))
+        if (isset($compile_id) || isset($cache_id))
             $auto_id = $compile_id . $cache_id;
         else
             $auto_id = null;
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index 047f55fd..ddccb0a2 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -429,7 +429,7 @@ class Smarty
         if (!isset($compile_id))
             $compile_id = $this->compile_id;
 
-        if (isset($compile_id) && isset($cache_id))
+        if (isset($compile_id) || isset($cache_id))
             $auto_id = $compile_id . $cache_id;
         else
             $auto_id = null;