Index: /trunk/src/VBox/Main/UnattendedTemplates/win_nt6_unattended.xml
===================================================================
--- /trunk/src/VBox/Main/UnattendedTemplates/win_nt6_unattended.xml	(revision 68242)
+++ /trunk/src/VBox/Main/UnattendedTemplates/win_nt6_unattended.xml	(revision 68243)
@@ -67,4 +67,13 @@
             </ComplianceCheck>
 
+        </component>
+    </settings>
+
+    <settings pass="specialize">
+        <component name="Microsoft-Windows-Shell-Setup"
+            processorArchitecture="@@VBOX_INSERT_OS_ARCH_ATTRIB_DQ@@"
+            publicKeyToken="31bf3856ad364e35" language="neutral"
+            versionScope="nonSxS">
+            <ComputerName>@@VBOX_INSERT_HOSTNAME_WITHOUT_DOMAIN_MAX_15@@</ComputerName>
         </component>
     </settings>
Index: /trunk/src/VBox/Main/src-server/UnattendedScript.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/UnattendedScript.cpp	(revision 68242)
+++ /trunk/src/VBox/Main/src-server/UnattendedScript.cpp	(revision 68243)
@@ -573,4 +573,6 @@
     else if (IS_PLACEHOLDER_MATCH("HOSTNAME_WITHOUT_DOMAIN"))
         rValue.assign(mpUnattended->i_getHostname(), 0, mpUnattended->i_getHostname().find("."));
+    else if (IS_PLACEHOLDER_MATCH("HOSTNAME_WITHOUT_DOMAIN_MAX_15"))
+        rValue.assign(mpUnattended->i_getHostname(), 0, RT_MIN(mpUnattended->i_getHostname().find("."), 15));
     else if (IS_PLACEHOLDER_MATCH("HOSTNAME_DOMAIN"))
         rValue.assign(mpUnattended->i_getHostname(), mpUnattended->i_getHostname().find(".") + 1);