diff --git a/src/vmm/LibVirtDriver.cc b/src/vmm/LibVirtDriver.cc
index 47aa475fca..ccf5413447 100644
--- a/src/vmm/LibVirtDriver.cc
+++ b/src/vmm/LibVirtDriver.cc
@@ -489,22 +489,35 @@ int LibVirtDriver::deployment_description(
         {
             pae  = features->vector_value("PAE");
             acpi = features->vector_value("ACPI");
-
-            file << "\t<features>" << endl;
-
-            if ( pae == "yes" )
-            {
-                file << "\t\t<pae/>" << endl;
-            }
-
-            if ( acpi == "no" )
-            {
-                file << "\t\t<acpi/>" << endl;
-            }
-
-            file << "\t</features>" << endl;
         }
     }
+    
+    if ( pae.empty() )
+    {
+        get_default("FEATURES", "PAE", pae);
+    }
+    
+    if ( acpi.empty() )
+    {
+        get_default("FEATURES", "ACPI", acpi);
+    }
+    
+    if( acpi=="yes" || pae=="yes" )
+    {
+        file << "\t<features>" << endl;
+
+        if ( pae == "yes" )
+        {
+            file << "\t\t<pae/>" << endl;
+        }
+
+        if ( acpi == "yes" )
+        {
+            file << "\t\t<acpi/>" << endl;
+        }
+
+        file << "\t</features>" << endl;
+    }
 
     attrs.clear();
 
diff --git a/src/vmm_mad/kvm/vmm_kvm.conf b/src/vmm_mad/kvm/vmm_kvm.conf
index fa62da68d8..7ba58ee1f4 100644
--- a/src/vmm_mad/kvm/vmm_kvm.conf
+++ b/src/vmm_mad/kvm/vmm_kvm.conf
@@ -5,9 +5,14 @@
 #  - memory
 #  - cpu
 #  - vcpu
+#  - features [acpi, pae]
 
 #VCPU = 1
 #MEMORY =  128
 #OS = [ kernel="/vmlinuz", initrd="/initrd.img", root="sda1", boot=hd,kernel_cmd="ro"]
 OS  = [ boot = "hd" ]
 
+FEATURES = [
+  PAE=no,
+  ACPI=yes
+]