Index: include/VBox/ostypes.h
===================================================================
--- include/VBox/ostypes.h	(revision 35998)
+++ include/VBox/ostypes.h	(working copy)
@@ -112,6 +112,8 @@
     VBOXOSTYPE_MacOS            = 0xB0000,
     VBOXOSTYPE_MacOS_x64        = 0xB0100,
     VBOXOSTYPE_JRockitVE        = 0xC0000,
+    VBOXOSTYPE_BeOS             = 0xD0000,
+    VBOXOSTYPE_Haiku            = 0xD1000,
 /** The bit number which indicates 64-bit or 32-bit. */
 #define VBOXOSTYPE_x64_BIT       8
     /** The mask which indicates 64-bit. */
Index: src/VBox/Main/xml/VirtualBox-settings-common.xsd
===================================================================
--- src/VBox/Main/xml/VirtualBox-settings-common.xsd	(revision 35998)
+++ src/VBox/Main/xml/VirtualBox-settings-common.xsd	(working copy)
@@ -204,6 +204,8 @@
     <xsd:enumeration value="MacOS"/>
     <xsd:enumeration value="MacOS_64"/>
     <xsd:enumeration value="JRockitVE"/>
+    <xsd:enumeration value="BeOS"/>
+    <xsd:enumeration value="Haiku"/>
   </xsd:restriction>
 </xsd:simpleType>
 
Index: src/VBox/Main/src-server/ApplianceImpl.cpp
===================================================================
--- src/VBox/Main/src-server/ApplianceImpl.cpp	(revision 35998)
+++ src/VBox/Main/src-server/ApplianceImpl.cpp	(working copy)
@@ -137,6 +137,8 @@
     //      SchemaDefs_OSTypeId_OpenBSD_64
     //      SchemaDefs_OSTypeId_NetBSD
     //      SchemaDefs_OSTypeId_NetBSD_64
+    //      SchemaDefs_OSTypeId_BeOS
+    //      SchemaDefs_OSTypeId_Haiku
 
 };
 
@@ -175,7 +177,9 @@
     {"Windows Me",    SchemaDefs_OSTypeId_WindowsMe},
     {"Windows 3.",    SchemaDefs_OSTypeId_Windows31},
     {"DOS",           SchemaDefs_OSTypeId_DOS},
-    {"OS2",           SchemaDefs_OSTypeId_OS2}
+    {"OS2",           SchemaDefs_OSTypeId_OS2},
+    {"BeOS",          SchemaDefs_OSTypeId_BeOS},
+    {"Haiku",         SchemaDefs_OSTypeId_Haiku}
 };
 
 /* These are the 64-Bit ones. They are sorted by priority. */
Index: src/VBox/Main/src-all/Global.cpp
===================================================================
--- src/VBox/Main/src-all/Global.cpp	(revision 35998)
+++ src/VBox/Main/src-all/Global.cpp	(working copy)
@@ -305,6 +305,14 @@
         VBOXOSTYPE_JRockitVE,     VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_PAE,
         1024, 4,  8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97  },
+    { "Other",   "Other",             SchemaDefs_OSTypeId_BeOS,             "BeOS",
+      VBOXOSTYPE_BeOS,             VBOXOSHINT_NONE,
+       256,   4,  4 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+    { "Other",   "Other",             SchemaDefs_OSTypeId_Haiku,             "Haiku",
+      VBOXOSTYPE_Haiku,             VBOXOSHINT_NONE,
+       256,   4,  4 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
 };
 
 /**
Index: src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
===================================================================
--- src/VBox/Frontends/VirtualBox/VirtualBox2.qrc	(revision 35998)
+++ src/VBox/Frontends/VirtualBox/VirtualBox2.qrc	(working copy)
@@ -2,6 +2,7 @@
  <qresource prefix="/">
     <file alias="os_archlinux.png">images/os_archlinux.png</file>
     <file alias="os_archlinux_64.png">images/os_archlinux_64.png</file>
+    <file alias="os_beos.png">images/os_beos.png</file>
     <file alias="os_debian.png">images/os_debian.png</file>
     <file alias="os_debian_64.png">images/os_debian_64.png</file>
     <file alias="os_dos.png">images/os_dos.png</file>
@@ -11,6 +12,7 @@
     <file alias="os_freebsd_64.png">images/os_freebsd_64.png</file>
     <file alias="os_gentoo.png">images/os_gentoo.png</file>
     <file alias="os_gentoo_64.png">images/os_gentoo_64.png</file>
+    <file alias="os_haiku.png">images/os_haiku.png</file>
     <file alias="os_jrockitve.png">images/os_jrockitve.png</file>
     <file alias="os_l4.png">images/os_l4.png</file>
     <file alias="os_linux_other.png">images/os_linux_other.png</file>
Index: src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp
===================================================================
--- src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp	(revision 35998)
+++ src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp	(working copy)
@@ -127,6 +127,10 @@
     { QRegExp("Net", Qt::CaseInsensitive), "Netware" },
     { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" },
     { QRegExp("Ot", Qt::CaseInsensitive), "Other" },
+    { QRegExp("BeOS", Qt::CaseInsensitive), "BeOS" },
+    { QRegExp("Be.*R5", Qt::CaseInsensitive), "BeOS" },
+    { QRegExp("Haiku", Qt::CaseInsensitive), "Haiku" },
+    { QRegExp("Hai.*R1", Qt::CaseInsensitive), "Haiku" },
 };
 
 UINewVMWzd::UINewVMWzd(QWidget *pParent) : QIWizard(pParent)
Index: src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
===================================================================
--- src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp	(revision 35998)
+++ src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp	(working copy)
@@ -4937,6 +4937,8 @@
         {"MacOS",           ":/os_macosx.png"},
         {"MacOS_64",        ":/os_macosx_64.png"},
         {"JRockitVE",       ":/os_jrockitve.png"},
+        {"BeOS",            ":/os_beos.png"},
+        {"Haiku",           ":/os_haiku.png"},
     };
     for (uint n = 0; n < SIZEOF_ARRAY (kOSTypeIcons); ++ n)
     {
