Index: /trunk/src/VBox/Main/ApplianceImplImport.cpp
===================================================================
--- /trunk/src/VBox/Main/ApplianceImplImport.cpp	(revision 33664)
+++ /trunk/src/VBox/Main/ApplianceImplImport.cpp	(revision 33665)
@@ -164,7 +164,11 @@
 
             /* Guest OS type */
-            Utf8Str strOsTypeVBox,
-                    strCIMOSType = Utf8StrFmt("%RI32", (uint32_t)vsysThis.cimos);
+            Utf8Str strOsTypeVBox;
+            Utf8Str strCIMOSType = Utf8StrFmt("%RI32", (uint32_t)vsysThis.cimos);
             convertCIMOSType2VBoxOSType(strOsTypeVBox, vsysThis.cimos, vsysThis.strCimosDesc);
+            /* If there is a vbox.xml, we always prefer the ostype settings
+             * from there, cause OVF doesn't know all types VBox know. */
+            if (vsysThis.pelmVboxMachine)
+                strOsTypeVBox = pNewDesc->m->pConfig->machineUserData.strOsType;
             pNewDesc->addEntry(VirtualSystemDescriptionType_OS,
                                "",
@@ -2370,4 +2374,5 @@
      */
 
+    config.machineUserData.strOsType = stack.strOsTypeVBox;
     config.machineUserData.strDescription = stack.strDescription;