diff --git a/contrib/fusiondirectory.conf b/contrib/fusiondirectory.conf
index f976f074ca165f2ff45e66de19d3aeb96e6d654f..f60259ca17389e5c3eb1f458b5ba6032cef92af0 100644
--- a/contrib/fusiondirectory.conf
+++ b/contrib/fusiondirectory.conf
@@ -1,5 +1,5 @@
 {literal}<?xml version="1.0"?>{/literal}
-<conf configVersion="{$config_checksum}" >
+<conf>
 
   <!-- Services **************************************************************
     Old services that are not based on simpleService needs to be listed here
diff --git a/contrib/man/fusiondirectory.conf.5 b/contrib/man/fusiondirectory.conf.5
index e662aef7f65a8567cc02b9ad4f43d9084ec0cc49..859ef6cf8d48c5370f4dc659dd6a53dea1c755e6 100644
--- a/contrib/man/fusiondirectory.conf.5
+++ b/contrib/man/fusiondirectory.conf.5
@@ -145,7 +145,7 @@ Layout example:
 <?xml version=\*(L"1.0\*(R"?>
 .PP
 .Vb 1
-\&   <conf configVersion="...." >
+\&   <conf>
 \&
 \&     <!\-\- Global setup \-\->
 \&     <main>
diff --git a/contrib/man/fusiondirectory.conf.pod b/contrib/man/fusiondirectory.conf.pod
index 428192380a54b77fb9be277a86d3679fcc4a2e68..0c80a57bb799a49e175f1dbfedbea1aea302bfd8 100644
--- a/contrib/man/fusiondirectory.conf.pod
+++ b/contrib/man/fusiondirectory.conf.pod
@@ -16,7 +16,7 @@ Layout example:
 
 <?xml version="1.0"?>
 
-   <conf configVersion="...." >
+   <conf>
 
      <!-- Global setup -->
      <main>
diff --git a/include/class_config.inc b/include/class_config.inc
index ccd80912433abf5722554bfa0bfda35ffb854664..14462fdff134a662247df0a8daba84d5e9ecdd1c 100644
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -63,7 +63,6 @@ class config  {
     'MENU'      => array()
   );
   var $basedir        = "";
-  var $config_version = "NOT SET";
 
   /* Keep a copy of the current department list */
   var $departments      = array();
@@ -182,9 +181,6 @@ class config  {
     /* Trigger on CONF section */
     if ($tag == 'CONF') {
       $this->config_found = TRUE;
-      if (isset($attrs['CONFIGVERSION'])) {
-        $this->config_version = $attrs['CONFIGVERSION'];
-      }
     }
 
     /* Return if we're not in config section */
diff --git a/setup/class_setupStep_Finish.inc b/setup/class_setupStep_Finish.inc
index ab50e654edf75a7a38689cee439a6ecf4554e135..adc0736498e51ea710099b75f4d04115b6728f68 100644
--- a/setup/class_setupStep_Finish.inc
+++ b/setup/class_setupStep_Finish.inc
@@ -41,9 +41,11 @@ class Step_Finish extends setup_step
 
   function get_conf_data()
   {
-    $smarty = get_smarty();
-    $smarty->assign("cv",               xmlentities($this->parent->captured_values));
-    $smarty->assign("config_checksum",  md5(file_get_contents(CONFIG_TEMPLATE_DIR.CONFIG_FILE)));
+    $smarty           = get_smarty();
+    $cv               = $this->parent->captured_values;
+    $cv['debugLevel'] = $this->parent->getDebugLevel();
+    $smarty->assign('cv',                       xmlentities($cv));
+    $smarty->assign('templateCompileDirectory', SPOOL_DIR);
     return $smarty->fetch(CONFIG_TEMPLATE_DIR.CONFIG_FILE);
   }