diff -Naur VirtualBox-4.0.0_OSE/include/VBox/ostypes.h VirtualBox-4.0.0_OSE-magellan/include/VBox/ostypes.h
--- VirtualBox-4.0.0_OSE/include/VBox/ostypes.h	2010-12-05 19:17:32.000000000 +0100
+++ VirtualBox-4.0.0_OSE-magellan/include/VBox/ostypes.h	2010-12-24 12:21:00.000000000 +0100
@@ -96,6 +96,8 @@
     VBOXOSTYPE_Xandros_x64      = 0x5D100,
     VBOXOSTYPE_Oracle           = 0x5E000,
     VBOXOSTYPE_Oracle_x64       = 0x5E100,
+    VBOXOSTYPE_Magellan         = 0x5F000,
+    VBOXOSTYPE_Magellan_x64     = 0x5F100,
     VBOXOSTYPE_FreeBSD          = 0x60000,
     VBOXOSTYPE_FreeBSD_x64      = 0x60100,
     VBOXOSTYPE_OpenBSD          = 0x61000,
diff -Naur VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp VirtualBox-4.0.0_OSE-magellan/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
--- VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp	2010-12-17 16:14:24.000000000 +0100
+++ VirtualBox-4.0.0_OSE-magellan/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp	2010-12-24 12:21:57.000000000 +0100
@@ -4857,6 +4857,8 @@
         {"Fedora_64",       ":/os_fedora_64.png"},
         {"Gentoo",          ":/os_gentoo.png"},
         {"Gentoo_64",       ":/os_gentoo_64.png"},
+        {"Magellan",        ":/os_magellan.png"},
+        {"Magellan_64",     ":/os_magellan_64.png"},
         {"Mandriva",        ":/os_mandriva.png"},
         {"Mandriva_64",     ":/os_mandriva_64.png"},
         {"RedHat",          ":/os_redhat.png"},
diff -Naur VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp VirtualBox-4.0.0_OSE-magellan/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp
--- VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp	2010-11-16 14:12:08.000000000 +0100
+++ VirtualBox-4.0.0_OSE-magellan/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp	2010-12-24 12:23:03.000000000 +0100
@@ -199,10 +199,10 @@
         if (xpIndex != -1)
             mCbType->setCurrentIndex (xpIndex);
     }
-    /* Or select Ubuntu item for Linux family as default */
+    /* Or select Magellan item for Linux family as default */
     else if (familyId == "Linux")
     {
-        int ubIndex = mCbType->findData ("Ubuntu", RoleTypeID);
+        int ubIndex = mCbType->findData ("Magellan", RoleTypeID);
         if (ubIndex != -1)
             mCbType->setCurrentIndex (ubIndex);
     }
diff -Naur VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp VirtualBox-4.0.0_OSE-magellan/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp
--- VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp	2010-12-21 09:11:34.000000000 +0100
+++ VirtualBox-4.0.0_OSE-magellan/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp	2010-12-24 12:24:13.000000000 +0100
@@ -93,6 +93,8 @@
     { QRegExp("Fe", Qt::CaseInsensitive), "Fedora" },
     { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" },
     { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "Gentoo" },
+    { QRegExp("Mage.*64", Qt::CaseInsensitive), "Magellan_64" },
+    { QRegExp("Mage", Qt::CaseInsensitive), "Magellan" },
     { QRegExp("Man.*64", Qt::CaseInsensitive), "Mandriva_64" },
     { QRegExp("Man", Qt::CaseInsensitive), "Mandriva" },
     { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" },
diff -Naur VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc VirtualBox-4.0.0_OSE-magellan/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
--- VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc	2010-12-14 09:26:26.000000000 +0100
+++ VirtualBox-4.0.0_OSE-magellan/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc	2010-12-24 12:24:58.000000000 +0100
@@ -19,6 +19,8 @@
     <file alias="os_linux24_64.png">images/os_linux24_64.png</file>
     <file alias="os_linux26.png">images/os_linux26.png</file>
     <file alias="os_linux26_64.png">images/os_linux26_64.png</file>
+    <file alias="os_magellan.png">images/os_magellan.png</file>
+    <file alias="os_magellan_64.png">images/os_magellan_64.png</file>
     <file alias="os_mandriva.png">images/os_mandriva.png</file>
     <file alias="os_mandriva_64.png">images/os_mandriva_64.png</file>
     <file alias="os_netbsd.png">images/os_netbsd.png</file>
diff -Naur VirtualBox-4.0.0_OSE/src/VBox/Main/ApplianceImpl.cpp VirtualBox-4.0.0_OSE-magellan/src/VBox/Main/ApplianceImpl.cpp
--- VirtualBox-4.0.0_OSE/src/VBox/Main/ApplianceImpl.cpp	2010-12-22 15:00:24.000000000 +0100
+++ VirtualBox-4.0.0_OSE-magellan/src/VBox/Main/ApplianceImpl.cpp	2010-12-24 12:37:05.000000000 +0100
@@ -116,6 +116,8 @@
     { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       SchemaDefs_OSTypeId_Fedora_64 },
     { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          SchemaDefs_OSTypeId_Gentoo },
     { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       SchemaDefs_OSTypeId_Gentoo_64 },
+    { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          SchemaDefs_OSTypeId_Magellan },
+    { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       SchemaDefs_OSTypeId_Magellan_64 },
     { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          SchemaDefs_OSTypeId_Xandros },
     { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       SchemaDefs_OSTypeId_Xandros_64 },
     { ovf::CIMOSType_CIMOS_Solaris,                              SchemaDefs_OSTypeId_OpenSolaris },
diff -Naur VirtualBox-4.0.0_OSE/src/VBox/Main/Global.cpp VirtualBox-4.0.0_OSE-magellan/src/VBox/Main/Global.cpp
--- VirtualBox-4.0.0_OSE/src/VBox/Main/Global.cpp	2010-12-09 21:41:45.000000000 +0100
+++ VirtualBox-4.0.0_OSE-magellan/src/VBox/Main/Global.cpp	2010-12-24 12:27:37.000000000 +0100
@@ -163,6 +163,14 @@
       VBOXOSTYPE_Gentoo_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
        256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
+    { "Linux",   "Linux",             SchemaDefs_OSTypeId_Magellan,          "Magellan Linux",
+      VBOXOSTYPE_Magellan,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
+    { "Linux",   "Linux",             SchemaDefs_OSTypeId_Magellan_64,       "Magellan Linux (64 bit)",
+      VBOXOSTYPE_Magellan_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
     { "Linux",   "Linux",             SchemaDefs_OSTypeId_Mandriva,        "Mandriva",
       VBOXOSTYPE_Mandriva,        VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
diff -Naur VirtualBox-4.0.0_OSE/src/VBox/Main/xml/SettingsConverter.xsl VirtualBox-4.0.0_OSE-magellan/src/VBox/Main/xml/SettingsConverter.xsl
--- VirtualBox-4.0.0_OSE/src/VBox/Main/xml/SettingsConverter.xsl	2010-04-27 22:24:51.000000000 +0200
+++ VirtualBox-4.0.0_OSE-magellan/src/VBox/Main/xml/SettingsConverter.xsl	2010-12-24 12:28:07.000000000 +0100
@@ -752,6 +752,7 @@
         <xsl:when test="@OSType='opensuse'">OpenSUSE</xsl:when>
         <xsl:when test="@OSType='fedoracore'">Fedora</xsl:when>
         <xsl:when test="@OSType='gentoo'">Gentoo</xsl:when>
+        <xsl:when test="@OSType='magellan'">Magellan</xsl:when>
         <xsl:when test="@OSType='mandriva'">Mandriva</xsl:when>
         <xsl:when test="@OSType='redhat'">RedHat</xsl:when>
         <xsl:when test="@OSType='ubuntu'">Ubuntu</xsl:when>
diff -Naur VirtualBox-4.0.0_OSE/src/VBox/Main/xml/Settings.cpp VirtualBox-4.0.0_OSE-magellan/src/VBox/Main/xml/Settings.cpp
--- VirtualBox-4.0.0_OSE/src/VBox/Main/xml/Settings.cpp	2010-12-17 16:14:21.000000000 +0100
+++ VirtualBox-4.0.0_OSE-magellan/src/VBox/Main/xml/Settings.cpp	2010-12-24 12:28:26.000000000 +0100
@@ -3140,6 +3140,7 @@
     { "opensuse", "OpenSUSE" },
     { "fedoracore", "Fedora" },
     { "gentoo", "Gentoo" },
+    { "magellan", "Magellan" },
     { "mandriva", "Mandriva" },
     { "redhat", "RedHat" },
     { "ubuntu", "Ubuntu" },
diff -Naur VirtualBox-4.0.0_OSE/src/VBox/Main/xml/VirtualBox-settings-common.xsd VirtualBox-4.0.0_OSE-magellan/src/VBox/Main/xml/VirtualBox-settings-common.xsd
--- VirtualBox-4.0.0_OSE/src/VBox/Main/xml/VirtualBox-settings-common.xsd	2010-12-14 09:26:25.000000000 +0100
+++ VirtualBox-4.0.0_OSE-magellan/src/VBox/Main/xml/VirtualBox-settings-common.xsd	2010-12-24 12:28:52.000000000 +0100
@@ -177,6 +177,8 @@
     <xsd:enumeration value="Fedora_64"/>
     <xsd:enumeration value="Gentoo"/>
     <xsd:enumeration value="Gentoo_64"/>
+    <xsd:enumeration value="Magellan"/>
+    <xsd:enumeration value="Magellan_64"/>
     <xsd:enumeration value="Mandriva"/>
     <xsd:enumeration value="Mandriva_64"/>
     <xsd:enumeration value="RedHat"/>