Index: /trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsVista.nsh
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsVista.nsh	(revision 41013)
+++ /trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsVista.nsh	(revision 41014)
@@ -76,4 +76,7 @@
   ;FILE "$%PATH_OUT%\bin\additions\VBoxNET.sys"
 
+!ifdef VBOX_WITH_MMR
+  FILE "$%PATH_OUT%\bin\additions\VBoxMMR.dll"
+!endif
 
 FunctionEnd
@@ -85,4 +88,10 @@
   SetOutPath "$INSTDIR"
   ; Nothing here yet
+
+!ifdef VBOX_WITH_MMR
+  DetailPrint "Registering VBoxMMR.dll ..."
+  nsExec::ExecToLog '"$g_strSystemDir\regsvr32.exe" -s "$INSTDIR\VBoxMMR.dll"'
+!endif
+
   Goto done
 
@@ -125,4 +134,11 @@
    Delete /REBOOTOK "$g_strSystemDir\VBoxCredProv.dll"
 
+!ifdef VBOX_WITH_MMR
+   DetailPrint "Unregistering VBoxMMR.dll ..."
+   nsExec::ExecToLog '"$g_strSystemDir\regsvr32.exe" -s -u "$INSTDIR\VBoxMMR.dll"'
+
+   Delete /REBOOTOK "$INSTDIR\VBoxMMR.dll"
+!endif
+
 FunctionEnd
 !macroend
Index: /trunk/src/VBox/Additions/WINNT/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Makefile.kmk	(revision 41013)
+++ /trunk/src/VBox/Additions/WINNT/Makefile.kmk	(revision 41014)
@@ -33,4 +33,8 @@
 endif
 
+ifdef VBOX_WITH_MMR
+include $(PATH_SUB_CURRENT)/VBoxMMR/Makefile.kmk
+endif
+
 include $(KBUILD_PATH)/subfooter.kmk