diff --git a/media/inf/hal.inf b/media/inf/hal.inf
index f631cd14dd5..9ae5318a4f7 100644
--- a/media/inf/hal.inf
+++ b/media/inf/hal.inf
@@ -23,10 +23,13 @@ HKR, , Icon,           0, "-27"
 
 [Manufacturer]
 %GenericMfg% = GenericMfg
+%MsftMfg% = MsftMfg
 
 [GenericMfg]
 %acpipic_up.DeviceDesc% = NO_DRV,acpipic_up
 %e_isa_up.DeviceDesc% = NO_DRV,e_isa_up
+
+[MsftMfg]
 %xbox.DeviceDesc% = NO_DRV,xbox
 
 ;------------------------------ NO DRIVER -----------------------------
@@ -46,6 +49,8 @@ ComputerClassName = "Computer"
 GenericMfg = "(Generic computers)"
 acpipic_up.DeviceDesc = "ACPI Uniprocessor PC"
 e_isa_up.DeviceDesc = "Standard Uniprocessor PC"
+
+MsftMfg = "Microsoft Corporation"
 xbox.DeviceDesc = "Original Xbox (x86 based)"
 
 [Strings.0405]
@@ -53,6 +58,8 @@ ComputerClassName = "Počítač"
 GenericMfg = "(Obecné počítače)"
 acpipic_up.DeviceDesc = "Jednoprocesorové PC s ACPI rozhraním"
 e_isa_up.DeviceDesc = "Standardní jednoprocesorové PC"
+
+MsftMfg = "Microsoft Corporation"
 xbox.DeviceDesc = "Original Xbox (x86 based)"
 
 [Strings.0a]
@@ -63,6 +70,8 @@ ComputerClassName = "Equipo"
 GenericMfg = "(Equipos genéricos)"
 acpipic_up.DeviceDesc = "PC con uniprocesador ACPI"
 e_isa_up.DeviceDesc = "PC con uniprocesador estándar"
+
+MsftMfg = "Microsoft Corporation"
 xbox.DeviceDesc = "Original Xbox (x86 based)"
 
 [Strings.0415]
@@ -73,6 +82,8 @@ ComputerClassName = "Komputer"
 GenericMfg = "(Komputery standardowe)"
 acpipic_up.DeviceDesc = "Komputer PC z interfejsem ACPI"
 e_isa_up.DeviceDesc = "Standardowy komputer PC"
+
+MsftMfg = "Microsoft Corporation"
 xbox.DeviceDesc = "Original Xbox (x86 based)"
 
 [Strings.0418]
@@ -83,6 +94,8 @@ ComputerClassName = "Calculator"
 GenericMfg = "(calculatoare generice)"
 acpipic_up.DeviceDesc = "PC uniprocesor ACPI"
 e_isa_up.DeviceDesc = "PC uniprocesor standard"
+
+MsftMfg = "Microsoft Corporation"
 xbox.DeviceDesc = "Original Xbox (x86 based)"
 
 [Strings.0419]
@@ -93,6 +106,8 @@ ComputerClassName = "Компьютер"
 GenericMfg = "(Универсальный компьютер)"
 acpipic_up.DeviceDesc = "ACPI однопроцессорный ПК"
 e_isa_up.DeviceDesc = "Стандартный однопроцессорный ПК"
+
+MsftMfg = "Корпорация Microsoft"
 xbox.DeviceDesc = "Оригинальный Xbox (на базе x86)"
 
 [Strings.041f]
@@ -103,6 +118,8 @@ ComputerClassName = "Bilgisayar"
 GenericMfg = "(Umûmî Bilgisayarlar)"
 acpipic_up.DeviceDesc = "ACPI Tek İşlemcili PC"
 e_isa_up.DeviceDesc = "Ölçünlü Tek İşlemcili PC"
+
+MsftMfg = "Microsoft Corporation"
 xbox.DeviceDesc = "Original Xbox (x86 based)"
 
 [Strings.0422]
@@ -113,10 +130,14 @@ ComputerClassName = "Комп'ютер"
 GenericMfg = "(Стандартний комп'ютер)"
 acpipic_up.DeviceDesc = "ACPI однопроцесорний ПК"
 e_isa_up.DeviceDesc = "Стандартний однопроцесорний ПК"
+
+MsftMfg = "Microsoft Corporation"
 xbox.DeviceDesc = "Original Xbox (x86 based)"
 
 [Strings.0804]
 GenericMfg = "(通用计算机)"
 acpipic_up.DeviceDesc = "ACPI 单处理器 PC"
 e_isa_up.DeviceDesc = "标准单处理器 PC"
+
+MsftMfg = "Microsoft Corporation"
 xbox.DeviceDesc = "Original Xbox (x86 based)"
diff --git a/media/inf/machine.inf b/media/inf/machine.inf
index 744907fed7b..d107e6be95f 100644
--- a/media/inf/machine.inf
+++ b/media/inf/machine.inf
@@ -24,6 +24,7 @@ HKR, , Icon,           0, "-27"
 [Manufacturer]
 %GenericMfg% = GenericMfg
 %IntelMfg% = IntelMfg
+%nVidiaMfg% = nVidiaMfg
 
 [GenericMfg]
 %*PNP0000.DeviceDesc% = NO_DRV,*PNP0000
@@ -69,6 +70,14 @@ HKR, , Icon,           0, "-27"
 %PCI\VEN_8086&DEV_7190.DeviceDesc% = NO_DRV,PCI\VEN_8086&DEV_7190
 %PCI\VEN_8086&DEV_7192.DeviceDesc% = NO_DRV,PCI\VEN_8086&DEV_7192
 
+[nVidiaMfg]
+%PCI\VEN_10DE&DEV_01B2.DeviceDesc% = PCI_ISA_Inst,PCI\VEN_10DE&DEV_01B2
+%PCI\VEN_10DE&DEV_01B4.DeviceDesc% = NO_DRV,PCI\VEN_10DE&DEV_01B4
+%PCI\VEN_10DE&DEV_01B7.DeviceDesc% = NO_DRV,PCI\VEN_10DE&DEV_01B7
+%PCI\VEN_10DE&DEV_01B8.DeviceDesc% = NO_DRV,PCI\VEN_10DE&DEV_01B8
+%PCI\VEN_10DE&DEV_02A5.DeviceDesc% = NO_DRV,PCI\VEN_10DE&DEV_02A5
+%PCI\VEN_10DE&DEV_02A6.DeviceDesc% = NO_DRV,PCI\VEN_10DE&DEV_02A6
+
 ;---------------------------- NO DRIVER REQ -----------------------------
 
 [NO_DRV]
@@ -192,6 +201,14 @@ PCI\VEN_8086&DEV_7180.DeviceDesc = "Intel 82443LX/EX Pentium(R) II CPU to PCI-Br
 PCI\VEN_8086&DEV_7190.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU to PCI-Bridge"
 PCI\VEN_8086&DEV_7192.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU to PCI-Bridge"
 
+nVidiaMfg = "nVidia Corporation"
+PCI\VEN_10DE&DEV_01B2.DeviceDesc = "nVidia nForce PCI to ISA Bridge"
+PCI\VEN_10DE&DEV_01B4.DeviceDesc = "nVidia nForce SMBus Controller"
+PCI\VEN_10DE&DEV_01B7.DeviceDesc = "nVidia nForce AGP to PCI Bridge"
+PCI\VEN_10DE&DEV_01B8.DeviceDesc = "nVidia nForce PCI to PCI Bridge"
+PCI\VEN_10DE&DEV_02A5.DeviceDesc = "nVidia MCPX CPU Bridge"
+PCI\VEN_10DE&DEV_02A6.DeviceDesc = "nVidia MCPX Memory Controller"
+
 [Strings.0405]
 SystemClassName = "Systémová zařízení"