diff --git a/Smarty.class.php b/Smarty.class.php
index 3c14c5eb..af0d8a88 100644
--- a/Smarty.class.php
+++ b/Smarty.class.php
@@ -548,7 +548,7 @@ class Smarty
         if ($this->_conf_obj === null) {
             /* Prepare the configuration object. */
             if (!class_exists('Config_File'))
-                include_once 'Config_File.class.php';
+                include_once SMARTY_DIR.'Config_File.class.php';
             $this->_conf_obj = new Config_File($this->config_dir);
         } else
             $this->_conf_obj->set_path($this->config_dir);
diff --git a/docs.sgml b/docs.sgml
index e09b3d8f..7f32a2b6 100644
--- a/docs.sgml
+++ b/docs.sgml
@@ -4084,7 +4084,7 @@ OUTPUT:
 {popup_init}
 
 {* create a link with a popup window when you move your mouse over *}
-<A href="mypage.html" {popup text="This link takes you to my page!}>mypage</A>
+<A href="mypage.html" {popup text="This link takes you to my page!"}>mypage</A>
 
 {* you can use html, links, etc in your popup text *}
 <A href="mypage.html" {popup sticky=true caption="mypage contents"
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index 3c14c5eb..af0d8a88 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -548,7 +548,7 @@ class Smarty
         if ($this->_conf_obj === null) {
             /* Prepare the configuration object. */
             if (!class_exists('Config_File'))
-                include_once 'Config_File.class.php';
+                include_once SMARTY_DIR.'Config_File.class.php';
             $this->_conf_obj = new Config_File($this->config_dir);
         } else
             $this->_conf_obj->set_path($this->config_dir);