diff --git a/change_log.txt b/change_log.txt
index d767e7cb..aa508715 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,3 +1,6 @@
+10/26/2009
+- merge only compiled subtemplates into the compiled code of the main template
+
 10/24/2009
 - fixed nocache vars at internal block tags
 - fixed merging of recursive includes
diff --git a/libs/sysplugins/internal.compile_include.php b/libs/sysplugins/internal.compile_include.php
index b3d798f1..68e99ce6 100644
--- a/libs/sysplugins/internal.compile_include.php
+++ b/libs/sysplugins/internal.compile_include.php
@@ -36,7 +36,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
                 eval("\$tmp = $include_file;");
 				if ($this->compiler->template->template_resource != $tmp) {
                 $tpl = $compiler->smarty->createTemplate ($tmp, $compiler->template->cache_id, $compiler->template->compile_id, $compiler->template);
-                if ($tpl->isExisting()) {
+                if ($tpl->usesCompiler() && $tpl->isExisting()) {
                     do {
                         $must_compile = false;
                         $prop = array();