diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 9122bfa99e7f..503f9e5529c0 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -88,6 +88,7 @@ error.something.went.wrong.please.correct.the.following=Something went wrong; pl
 error.unable.to.reach.management.server=Unable to reach Management Server
 error.unresolved.internet.name=Your internet name cannot be resolved.
 label.extractable=Extractable
+label.enlightenment=Enlightenment
 force.delete.domain.warning=Warning\: Choosing this option will cause the deletion of all child domains and all associated accounts and their resources.
 force.delete=Force Delete
 force.remove.host.warning=Warning\: Choosing this option will cause CloudStack to forcefully stop all running virtual machines before removing this host from the cluster.
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index a6625b7b6e3e..d25cb6c433fe 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -117,6 +117,7 @@ dictionary = {
 'error.unable.to.reach.management.server': '<fmt:message key="error.unable.to.reach.management.server" />',
 'error.unresolved.internet.name': '<fmt:message key="error.unresolved.internet.name" />',
 'label.extractable': '<fmt:message key="label.extractable" />',
+'label.enlightenment': '<fmt:message key="label.enlightenment"/>',
 'force.delete.domain.warning': '<fmt:message key="force.delete.domain.warning" />',
 'force.delete': '<fmt:message key="force.delete" />',
 'force.remove': '<fmt:message key="force.remove" />',
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index f27c55e7e241..22a23dc8595c 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -497,6 +497,28 @@
                                         }
                                     },
 
+                                    enlightenment: {
+                                        label: "label.enlightenment",
+                                        select: function(args) {
+                                            var items = []
+                                            items.push({
+                                                id: "none",
+                                                description: "none"
+                                            });
+                                            items.push({
+                                                id: "true",
+                                                description: "true"
+                                            });
+                                            items.push({
+                                                id: "false",
+                                                description: "false"
+                                            });
+                                            args.response.success({
+                                                data: items
+                                            });
+                                        }
+                                    },
+
                                     isExtractable: {
                                         label: "label.extractable",
                                         docID: 'helpRegisterTemplateExtractable',
@@ -582,6 +604,12 @@
                                     });
                                 }
 
+                                if(args.data.enlightenment != "none") {
+                                    $.extend(data, {
+                                        'details[0].enlightenment': args.data.enlightenment
+                                    });
+                                }
+
                                 //XenServer only (starts here)
                                 if (args.$form.find('.form-item[rel=xenserverToolsVersion61plus]').css("display") != "none") {
                                     $.extend(data, {