Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 82325)
+++ /trunk/Config.kmk	(revision 82326)
@@ -3859,5 +3859,5 @@
 	-e 's/@DOT-NT-ARCH@//' \
 	-e 's/@COMMA-NT-ARCH@//' \
-	-e 's/^;edit-DriverVer.*/DriverVer = $(date-utc %m\/%d\/%Y),$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) ; r$(VBOX_SVN_REV)/' \
+	-e 's/^;edit-DriverVer.*/DriverVer = $(date-utc %m\/%d\/%Y),$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD).$(expr $(VBOX_SVN_REV) % 50000) ; r$(VBOX_SVN_REV)/' \
 	--output $(2) \
 	$(1)
@@ -3871,5 +3871,5 @@
 	-e 's/@DOT-NT-ARCH@/.ntamd64/' \
 	-e 's/@COMMA-NT-ARCH@/,ntamd64/' \
-	-e 's/^;edit-DriverVer.*/DriverVer = $(date-utc %m\/%d\/%Y),$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) ; r$(VBOX_SVN_REV)/' \
+	-e 's/^;edit-DriverVer.*/DriverVer = $(date-utc %m\/%d\/%Y),$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD).$(expr $(VBOX_SVN_REV) % 50000) ; r$(VBOX_SVN_REV)/' \
 	--output $(2) \
 	$(1)
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxWddm.inf
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxWddm.inf	(revision 82325)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxWddm.inf	(revision 82326)
@@ -94,5 +94,5 @@
 
 [VBoxVideo_EventLog_AddReg]
-HKR,,EventMessageFile,0x00020000,"%SystemRoot%\System32\IoLogMsg.dll;%SystemRoot%\System32\drivers\VBoxWddm.sys"
+HKR,,EventMessageFile,0x00020000,"%%SystemRoot%%\System32\IoLogMsg.dll;%%SystemRoot%%\System32\drivers\VBoxWddm.sys"
 HKR,,TypesSupported,0x00010001,7
 
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxVideo.inf
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxVideo.inf	(revision 82325)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxVideo.inf	(revision 82326)
@@ -56,5 +56,5 @@
 [vboxvideo_Service_Inst]
 ServiceType=1                   ; SERVICE_KERNEL_DRIVER
-StartType=1                     ; SERVICE_SYSTEM_START
+StartType=3                     ; SERVICE_DEMAND_START
 ErrorControl=0                  ; SERVICE_ERROR_IGNORE
 LoadOrderGroup=Video
@@ -65,5 +65,5 @@
 
 [vboxvideo_EventLog_AddReg]
-HKR,,EventMessageFile,0x00020000,"%SystemRoot%\System32\IoLogMsg.dll;%SystemRoot%\System32\drivers\VBoxVideo.sys"
+HKR,,EventMessageFile,0x00020000,"%%SystemRoot%%\System32\IoLogMsg.dll;%%SystemRoot%%\System32\drivers\VBoxVideo.sys"
 HKR,,TypesSupported,0x00010001,7
 
@@ -82,9 +82,8 @@
 ;amd64 [SourceDisksNames.amd64]
 1 = %VBoxVideo.Disk%,,,""
-2 = %VBoxVideo.Disk%,,,""
 
 [SourceDisksFiles]
 VBoxVideo.sys = 1
-VBoxDisp.dll = 2
+VBoxDisp.dll = 1
 
 [Strings]
Index: /trunk/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMouse.inf
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMouse.inf	(revision 82325)
+++ /trunk/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMouse.inf	(revision 82326)
@@ -18,4 +18,5 @@
 [Version]
 Signature="$Windows NT$"
+Provider=%ORACLE%
 ClassGuid={4D36E96F-E325-11CE-BFC1-08002BE10318}
 Class=Mouse
@@ -37,14 +38,12 @@
 ;amd64 %ORACLE%=VBoxMouse, NTamd64
 
+;x86   [VBoxMouse]
+;amd64 [VBoxMouse.NTamd64]
+%ORACLE%=VBoxMouse_Install
+
 [VBoxMouse_Install]
 CopyFiles = @VBoxMouse.sys
 
 [VBoxMouse_Install.Services]
-AddService = VBoxMouse,,VBoxMouse.Service
-
-[DefaultInstall]
-CopyFiles = @VBoxMouse.sys
-
-[DefaultInstall.Services]
 AddService = VBoxMouse,,VBoxMouse.Service
 
Index: /trunk/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.inf
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.inf	(revision 82325)
+++ /trunk/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.inf	(revision 82326)
@@ -36,11 +36,9 @@
 [SourceDisksNames]
 1 = %VBoxGuest.MediaDesc%
-2 = %VBoxControl.MediaDesc%
-3 = %VBoxTray.MediaDesc%
 
 [SourceDisksFiles]
 VBoxGuest.sys = 1
-VBoxControl.exe = 2
-VBoxTray.exe = 3
+VBoxControl.exe = 1
+VBoxTray.exe = 1
 
 [DestinationDirs]
@@ -80,5 +78,5 @@
 
 [VBoxTray_Add_Reg]
-HKLM, SOFTWARE\Microsoft\Windows\CurrentVersion\Run, VBoxTray, 0x00000000, %11%\VBoxTray.exe
+HKLM, SOFTWARE\Microsoft\Windows\CurrentVersion\Run, VBoxTray, 0x00000000, %%SystemRoot%%\system32\VBoxTray.exe
 
 [ClassInstall32]
@@ -87,6 +85,6 @@
 [Strings]
 ORACLE = "Oracle Corporation"
-VBoxGuest.DeviceDesc = "VirtualBox Device"
+VBoxGuest.DeviceDesc = "VirtualBox Guest Device"
 VBoxGuest_svcdesc = "VirtualBox Guest Driver"
 VBoxTray_svcdesc = "VirtualBox Guest Tray"
-
+VBoxGuest.MediaDesc = "VirtualBox Guest Driver Installation Disk"