Index: /trunk/include/VBox/ostypes.h
===================================================================
--- /trunk/include/VBox/ostypes.h	(revision 15967)
+++ /trunk/include/VBox/ostypes.h	(revision 15968)
@@ -65,4 +65,6 @@
     VBOXOSTYPE_Win2k8           = 0x36000,
     VBOXOSTYPE_Win2k8_x64       = 0x36100,
+    VBOXOSTYPE_Win7             = 0x37000,
+    VBOXOSTYPE_Win7_x64         = 0x37100,
     VBOXOSTYPE_OS2              = 0x40000,
     VBOXOSTYPE_OS2Warp3         = 0x41000,
Index: /trunk/src/VBox/Main/Global.cpp
===================================================================
--- /trunk/src/VBox/Main/Global.cpp	(revision 15967)
+++ /trunk/src/VBox/Main/Global.cpp	(revision 15968)
@@ -64,4 +64,8 @@
     { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2008_64,  "Windows 2008 (64 bit)",
       VBOXOSTYPE_Win2k8_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,  512,  12, 20 * _1K, NetworkAdapterType_I82540EM },
+    { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows7,        "Windows 7",
+      VBOXOSTYPE_Win7,          VBOXOSHINT_NONE, 512,  12, 20 * _1K, NetworkAdapterType_I82540EM },
+    { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows7_64,  "Windows 7 (64 bit)",
+      VBOXOSTYPE_Win7_x64,       VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,  512,  12, 20 * _1K, NetworkAdapterType_I82540EM },
     { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsNT,       "Other Windows",
       VBOXOSTYPE_WinNT,           VBOXOSHINT_NONE, 512,  12, 20 * _1K, NetworkAdapterType_Am79C973 },
Index: /trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd
===================================================================
--- /trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd	(revision 15967)
+++ /trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd	(revision 15968)
@@ -153,4 +153,6 @@
     <xsd:enumeration value="Windows2008"/>
     <xsd:enumeration value="Windows2008_64"/>
+    <xsd:enumeration value="Windows7"/>
+    <xsd:enumeration value="Windows7_64"/>
     <xsd:enumeration value="WindowsNT"/>
     <xsd:enumeration value="OS2Warp3"/>