diff --git a/driver/blackmagic.inf b/driver/blackmagic.inf
index 4208858..09d6846 100644
--- a/driver/blackmagic.inf
+++ b/driver/blackmagic.inf
@@ -1,40 +1,60 @@
+; Windows USB CDC ACM driver setup file.
+
+; Copyright (C) 2004 Al Borchers (alborchers@steinerpoint.com)
+; Taken from Linux documentation, modified for Black Magic debug probe
+; by Gareth McMullin <gareth@blacksphere.co.nz>
+
+; This provides the driver information for the GDB and UART interfaces to
+; be presented as virtual serial ports in Windows.
+
+; Common to Windows 32- and 64-bit systems
+
 [Version]
 Signature="$Windows NT$"
 Class=Ports
 ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318}
 Provider=%BLACKSPHERE%
 DriverVer=28/12/2011,0.0.1.1
-; Copyright (C) 2004 Al Borchers (alborchers@steinerpoint.com)
-
-; Taken from Linux documentation, modified for Black Magic debug probe
-; by Gareth McMullin <gareth@blacksphere.co.nz>
 
 [Manufacturer]
-%BLACKSPHERE%=BlackSphereDeviceList
+%VendorName%=DeviceList, NTamd64
 
-[BlackSphereDeviceList]
-%BLACKMAGICGDB%=BlackSphereInstall, USB\VID_0483&PID_5740&MI_00
-%BLACKMAGICUART%=BlackSphereInstall, USB\VID_0483&PID_5740&MI_02
+[Strings]
+VendorName = "Black Sphere Technologies"
+BLACKMAGICGDB = "Black Magic GDB Server"
+BLACKMAGICUART = "Black Magic UART Port"
+BLACKSPHERE_DISPLAY_NAME = "Black Magic Probe Driver"
+
+[DeviceList]
+%BLACKMAGICGDB%=DriverInstall, USB\VID_0483&PID_5740&Rev_0200&MI_00
+%BLACKMAGICUART%=DriverInstall, USB\VID_0483&PID_5740&Rev_0200&MI_02
+
+[DeviceList.NTamd64]
+%BLACKMAGICGDB%=DriverInstall, USB\VID_0483&PID_5740&Rev_0200&MI_00
+%BLACKMAGICUART%=DriverInstall, USB\VID_0483&PID_5740&Rev_0200&MI_02
 
 [DestinationDirs]
 DefaultDestDir=10,System32\Drivers
 
-[BlackSphereInstall]
-CopyFiles=BlackSphereCopyFiles
-AddReg=BlackSphereAddReg
+; Windows 32-bit sections
+;~~~~~~~~~~~~~~~~~~~~~~~~~
 
-[BlackSphereCopyFiles]
-usbser.sys
+[DriverInstall.nt]
+CopyFiles=DriverCopyFiles.nt
+AddReg=DriverInstall.nt.AddReg
 
-[BlackSphereAddReg]
+[DriverCopyFiles.nt]
+usbser.sys,,,0x20
+
+[DriverInstall.nt.AddReg]
 HKR,,DevLoader,,*ntkern
 HKR,,NTMPDriver,,usbser.sys
 HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
 
-[BlackSphereInstall.Services]
-AddService = usbser,0x0002,BlackSphereService
+[DriverInstall.nt.Services]
+AddService = usbser,0x0002,DriverService.nt
 
-[BlackSphereService]
+[DriverService.nt]
 DisplayName = %BLACKSPHERE_DISPLAY_NAME%
 ServiceType = 1                  ; SERVICE_KERNEL_DRIVER
 StartType = 3                    ; SERVICE_DEMAND_START
@@ -42,9 +62,28 @@ ErrorControl = 1                 ; SERVICE_ERROR_NORMAL
 ServiceBinary = %10%\System32\Drivers\usbser.sys
 LoadOrderGroup = Base
 
-[Strings]
-BLACKSPHERE = "Black Sphere Technologies"
-BLACKMAGICGDB = "Black Magic GDB Server"
-BLACKMAGICUART = "Black Magic UART Port"
-BLACKSPHERE_DISPLAY_NAME = "Black Magic Probe Driver"
+; Windows 64-bit sections
+;~~~~~~~~~~~~~~~~~~~~~~~~~
+[DriverInstall.NTamd64]
+CopyFiles=DriverCopyFiles.NTamd64
+AddReg=DriverInstall.NTamd64.AddReg
+
+[DriverCopyFiles.NTamd64]
+usbser.sys,,,0x20
+
+[DriverInstall.NTamd64.AddReg]
+HKR,,DevLoader,,*ntkern
+HKR,,NTMPDriver,,usbser.sys
+HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
+
+[DriverInstall.NTamd64.Services]
+AddService = usbser,0x0002,DriverService.NTamd64
+
+[DriverService.NTamd64]
+DisplayName = %BLACKSPHERE_DISPLAY_NAME%
+ServiceType = 1                  ; SERVICE_KERNEL_DRIVER
+StartType = 3                    ; SERVICE_DEMAND_START
+ErrorControl = 1                 ; SERVICE_ERROR_NORMAL
+ServiceBinary = %10%\System32\Drivers\usbser.sys
+LoadOrderGroup = Base