diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 271ffec8e5e..a0205e125c7 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -51,6 +51,7 @@ label.switch.type=Switch Type
 label.service.state=Service State
 label.egress.default.policy=Egress Default Policy
 label.routing=Routing
+label.hvm=HVM
 label.about=About
 label.app.name=CloudStack
 label.about.app=About CloudStack
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index beb082b4f7c..10aeaf9c1bf 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -64,6 +64,7 @@ dictionary = {
 'label.service.state': '<fmt:message key="label.service.state" />',
 'label.egress.default.policy': '<fmt:message key="label.egress.default.policy" />',
 'label.routing': '<fmt:message key="label.routing" />',
+'label.hvm': '<fmt:message key="label.hvm" />',
 'message.validate.invalid.characters': '<fmt:message key="message.validate.invalid.characters" />',
 'message.validate.fieldrequired': '<fmt:message key="message.validate.fieldrequired" />',
 'message.validate.fixfield': '<fmt:message key="message.validate.fixfield" />',
diff --git a/ui/scripts/docs.js b/ui/scripts/docs.js
index 2075e30f02d..8ef9f24cf1e 100755
--- a/ui/scripts/docs.js
+++ b/ui/scripts/docs.js
@@ -1218,6 +1218,10 @@ cloudStack.docs = {
         desc: 'Check this if the template is used for deploying router.',
         externalLink: ''
     },
+    helpRegisterTemplateHvm: {
+        desc: 'Check this if the template requires hvm.',
+        externalLink: ''
+    },
     // Upload volume
     helpUploadVolumeName: {
         desc: 'A unique name for the volume. This will be visible to users, so choose something descriptive.',
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index e12927c538a..3e048cc0b94 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -458,6 +458,13 @@
                                         docID: 'helpRegisterTemplateRouting',
                                         isBoolean: true,
                                         isHidden: true
+                                    },
+                                    requireshvm: {
+                                        label: 'label.hvm',
+                                        docID: 'helpRegisterTemplateHvm',
+                                        isBoolean: true,
+                                        isHidden: false,
+                                        isChecked: true
                                     }
                                 }
                             },
@@ -482,6 +489,12 @@
                                     });
                                 }
 
+                                if (args.$form.find('.form-item[rel=requireshvm]').css("display") != "none") {
+                                    $.extend(data, {
+                                        requireshvm: (args.data.requireshvm == "on")
+                                    });
+                                }
+
                                 if (args.$form.find('.form-item[rel=isFeatured]').css("display") != "none") {
                                     $.extend(data, {
                                         isfeatured: (args.data.isFeatured == "on")