diff --git a/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/avrispmkii.cat b/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/avrispmkii.cat
new file mode 100755
index 000000000..2ef39c526
--- /dev/null
+++ b/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/avrispmkii.cat	
@@ -0,0 +1,3 @@
+This file will contain the digital signature of the files to be installed
+on the system.
+This file will be provided by Microsoft upon certification of your drivers.
diff --git a/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/avrispmkii.inf b/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/avrispmkii.inf
new file mode 100755
index 000000000..e20c2eb62
--- /dev/null
+++ b/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/avrispmkii.inf	
@@ -0,0 +1,136 @@
+[Version]
+Signature = "$Chicago$"
+provider  = %manufacturer%
+DriverVer = 03/20/2007,0.1.12.1
+CatalogFile = avrispmkii.cat
+CatalogFile.NT = avrispmkii.cat
+CatalogFile.NTAMD64 = avrispmkii_x64.cat
+
+Class = LibUsbDevices
+ClassGUID = {EB781AAF-9C70-4523-A5DF-642A87ECA567}
+
+[ClassInstall]
+AddReg=libusb_class_install_add_reg
+
+[ClassInstall32]
+AddReg=libusb_class_install_add_reg
+
+[libusb_class_install_add_reg]
+HKR,,,,"LibUSB-Win32 Devices"
+HKR,,Icon,,"-20"
+
+[Manufacturer]
+%manufacturer%=Devices,NT,NTAMD64
+
+;--------------------------------------------------------------------------
+; Files
+;--------------------------------------------------------------------------
+
+[SourceDisksNames]
+1 = "Libusb-Win32 Driver Installation Disk",,
+
+[SourceDisksFiles]
+libusb0.sys = 1,,
+libusb0.dll = 1,,
+libusb0_x64.sys = 1,,
+libusb0_x64.dll = 1,,
+
+[DestinationDirs]
+libusb_files_sys = 10,system32\drivers
+libusb_files_sys_x64 = 10,system32\drivers
+libusb_files_dll = 10,system32
+libusb_files_dll_wow64 = 10,syswow64
+libusb_files_dll_x64 = 10,system32
+
+[libusb_files_sys]
+libusb0.sys
+
+[libusb_files_sys_x64]
+libusb0.sys,libusb0_x64.sys
+
+[libusb_files_dll]
+libusb0.dll
+
+[libusb_files_dll_wow64]
+libusb0.dll
+
+[libusb_files_dll_x64]
+libusb0.dll,libusb0_x64.dll
+
+;--------------------------------------------------------------------------
+; Device driver
+;--------------------------------------------------------------------------
+
+[LIBUSB_DEV]
+CopyFiles = libusb_files_sys, libusb_files_dll
+AddReg    = libusb_add_reg
+
+[LIBUSB_DEV.NT]
+CopyFiles = libusb_files_sys, libusb_files_dll
+
+[LIBUSB_DEV.NTAMD64]
+CopyFiles = libusb_files_sys_x64, libusb_files_dll_wow64, libusb_files_dll_x64
+
+[LIBUSB_DEV.HW]
+DelReg = libusb_del_reg_hw
+AddReg = libusb_add_reg_hw
+
+[LIBUSB_DEV.NT.HW]
+DelReg = libusb_del_reg_hw
+AddReg = libusb_add_reg_hw
+
+[LIBUSB_DEV.NTAMD64.HW]
+DelReg = libusb_del_reg_hw
+AddReg = libusb_add_reg_hw
+
+[LIBUSB_DEV.NT.Services]
+AddService = libusb0, 0x00000002, libusb_add_service
+
+[LIBUSB_DEV.NTAMD64.Services]
+AddService = libusb0, 0x00000002, libusb_add_service
+
+[libusb_add_reg]
+HKR,,DevLoader,,*ntkern
+HKR,,NTMPDriver,,libusb0.sys
+
+; Older versions of this .inf file installed filter drivers. They are not
+; needed any more and must be removed
+[libusb_del_reg_hw]
+HKR,,LowerFilters
+HKR,,UpperFilters
+
+; Device properties
+[libusb_add_reg_hw]
+HKR,,SurpriseRemovalOK, 0x00010001, 1
+
+;--------------------------------------------------------------------------
+; Services
+;--------------------------------------------------------------------------
+
+[libusb_add_service]
+DisplayName    = "LibUsb-Win32 - Kernel Driver 03/20/2007, 0.1.12.1"
+ServiceType    = 1
+StartType      = 3
+ErrorControl   = 0
+ServiceBinary  = %12%\libusb0.sys
+
+;--------------------------------------------------------------------------
+; Devices
+;--------------------------------------------------------------------------
+
+[Devices]
+"AVRISP mkII"=LIBUSB_DEV, USB\VID_03eb&PID_2104
+
+[Devices.NT]
+"AVRISP mkII"=LIBUSB_DEV, USB\VID_03eb&PID_2104
+
+[Devices.NTAMD64]
+"AVRISP mkII"=LIBUSB_DEV, USB\VID_03eb&PID_2104
+
+
+;--------------------------------------------------------------------------
+; Strings
+;--------------------------------------------------------------------------
+
+[Strings]
+manufacturer = "Atmel"
diff --git a/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/avrispmkii_x64.cat b/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/avrispmkii_x64.cat
new file mode 100755
index 000000000..2ef39c526
--- /dev/null
+++ b/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/avrispmkii_x64.cat	
@@ -0,0 +1,3 @@
+This file will contain the digital signature of the files to be installed
+on the system.
+This file will be provided by Microsoft upon certification of your drivers.
diff --git a/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/inf-wizard.exe b/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/inf-wizard.exe
new file mode 100755
index 000000000..15a9ffa1f
Binary files /dev/null and b/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/inf-wizard.exe differ
diff --git a/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/install-filter.exe b/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/install-filter.exe
new file mode 100755
index 000000000..da7d4d6cb
Binary files /dev/null and b/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/install-filter.exe differ
diff --git a/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/libusb0.dll b/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/libusb0.dll
new file mode 100755
index 000000000..9387bedad
Binary files /dev/null and b/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/libusb0.dll differ
diff --git a/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/libusb0.sys b/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/libusb0.sys
new file mode 100755
index 000000000..0a02d3ee3
Binary files /dev/null and b/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/libusb0.sys differ
diff --git a/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/libusb0_x64.dll b/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/libusb0_x64.dll
new file mode 100755
index 000000000..c89a59fe3
Binary files /dev/null and b/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/libusb0_x64.dll differ
diff --git a/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/libusb0_x64.sys b/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/libusb0_x64.sys
new file mode 100755
index 000000000..07cf0858a
Binary files /dev/null and b/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/libusb0_x64.sys differ
diff --git a/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/testlibusb-win.exe b/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/testlibusb-win.exe
new file mode 100755
index 000000000..a0c3e3177
Binary files /dev/null and b/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/testlibusb-win.exe differ
diff --git a/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/testlibusb.exe b/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/testlibusb.exe
new file mode 100755
index 000000000..e6a0b6290
Binary files /dev/null and b/build/windows/dist/drivers/AVRISP mkII LibUSB Drivers/testlibusb.exe differ