diff --git a/Makefile.in b/Makefile.in
index fc4d43a10e6..5be823d0f61 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -288,6 +288,7 @@ ALL_MAKEFILES = \
 	dlls/mlang/tests/Makefile \
 	dlls/mmdevldr.vxd/Makefile \
 	dlls/monodebg.vxd/Makefile \
+	dlls/mountmgr.sys/Makefile \
 	dlls/mpr/Makefile \
 	dlls/mprapi/Makefile \
 	dlls/msacm32.drv/Makefile \
@@ -672,6 +673,7 @@ dlls/mlang/Makefile: dlls/mlang/Makefile.in dlls/Makedll.rules
 dlls/mlang/tests/Makefile: dlls/mlang/tests/Makefile.in dlls/Maketest.rules
 dlls/mmdevldr.vxd/Makefile: dlls/mmdevldr.vxd/Makefile.in dlls/Makedll.rules
 dlls/monodebg.vxd/Makefile: dlls/monodebg.vxd/Makefile.in dlls/Makedll.rules
+dlls/mountmgr.sys/Makefile: dlls/mountmgr.sys/Makefile.in dlls/Makedll.rules
 dlls/mpr/Makefile: dlls/mpr/Makefile.in dlls/Makedll.rules
 dlls/mprapi/Makefile: dlls/mprapi/Makefile.in dlls/Makedll.rules
 dlls/msacm32.drv/Makefile: dlls/msacm32.drv/Makefile.in dlls/Makedll.rules
diff --git a/configure b/configure
index 3b59e506bd0..0c99eaed2c3 100755
--- a/configure
+++ b/configure
@@ -20868,6 +20868,8 @@ ac_config_files="$ac_config_files dlls/mmdevldr.vxd/Makefile"
 
 ac_config_files="$ac_config_files dlls/monodebg.vxd/Makefile"
 
+ac_config_files="$ac_config_files dlls/mountmgr.sys/Makefile"
+
 ac_config_files="$ac_config_files dlls/mpr/Makefile"
 
 ac_config_files="$ac_config_files dlls/mprapi/Makefile"
@@ -22042,6 +22044,7 @@ do
     "dlls/mlang/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mlang/tests/Makefile" ;;
     "dlls/mmdevldr.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mmdevldr.vxd/Makefile" ;;
     "dlls/monodebg.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/monodebg.vxd/Makefile" ;;
+    "dlls/mountmgr.sys/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mountmgr.sys/Makefile" ;;
     "dlls/mpr/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mpr/Makefile" ;;
     "dlls/mprapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mprapi/Makefile" ;;
     "dlls/msacm32.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msacm32.drv/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index 3ca94d4e8e4..469490457df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1714,6 +1714,7 @@ AC_CONFIG_FILES([dlls/mlang/Makefile])
 AC_CONFIG_FILES([dlls/mlang/tests/Makefile])
 AC_CONFIG_FILES([dlls/mmdevldr.vxd/Makefile])
 AC_CONFIG_FILES([dlls/monodebg.vxd/Makefile])
+AC_CONFIG_FILES([dlls/mountmgr.sys/Makefile])
 AC_CONFIG_FILES([dlls/mpr/Makefile])
 AC_CONFIG_FILES([dlls/mprapi/Makefile])
 AC_CONFIG_FILES([dlls/msacm32.drv/Makefile])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index cfb324779fa..907bceb7be5 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -110,6 +110,7 @@ BASEDIRS = \
 	mlang \
 	mmdevldr.vxd \
 	monodebg.vxd \
+	mountmgr.sys \
 	mpr \
 	mprapi \
 	msacm32 \
diff --git a/dlls/mountmgr.sys/Makefile.in b/dlls/mountmgr.sys/Makefile.in
new file mode 100644
index 00000000000..f73e4d473c6
--- /dev/null
+++ b/dlls/mountmgr.sys/Makefile.in
@@ -0,0 +1,14 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = mountmgr.sys
+IMPORTS   = advapi32 ntoskrnl.exe kernel32 ntdll
+EXTRADLLFLAGS = -Wb,--subsystem,native
+
+C_SRCS = \
+	mountmgr.c
+
+@MAKE_DLL_RULES@
+
+@DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c
new file mode 100644
index 00000000000..3bc9534aa71
--- /dev/null
+++ b/dlls/mountmgr.sys/mountmgr.c
@@ -0,0 +1,86 @@
+/*
+ * Mount manager service implementation
+ *
+ * Copyright 2008 Alexandre Julliard
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+#include <unistd.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
+#include "windef.h"
+#include "winbase.h"
+#include "winternl.h"
+#include "winioctl.h"
+#include "ddk/wdm.h"
+#include "ddk/mountmgr.h"
+#include "wine/library.h"
+#include "wine/unicode.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(mountmgr);
+
+/* handler for ioctls on the mount manager device */
+static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp )
+{
+    IO_STACK_LOCATION *irpsp = irp->Tail.Overlay.s.u.CurrentStackLocation;
+
+    TRACE( "ioctl %x insize %u outsize %u\n",
+           irpsp->Parameters.DeviceIoControl.IoControlCode,
+           irpsp->Parameters.DeviceIoControl.InputBufferLength,
+           irpsp->Parameters.DeviceIoControl.OutputBufferLength );
+
+    switch(irpsp->Parameters.DeviceIoControl.IoControlCode)
+    {
+    default:
+        FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode );
+        irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED;
+        break;
+    }
+    return irp->IoStatus.u.Status;
+}
+
+/* main entry point for the mount point manager driver */
+NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path )
+{
+    static const WCHAR device_mountmgrW[] = {'\\','D','e','v','i','c','e','\\','M','o','u','n','t','P','o','i','n','t','M','a','n','a','g','e','r',0};
+    static const WCHAR link_mountmgrW[] = {'\\','?','?','\\','M','o','u','n','t','P','o','i','n','t','M','a','n','a','g','e','r',0};
+
+    UNICODE_STRING nameW, linkW;
+    DEVICE_OBJECT *device;
+    NTSTATUS status;
+
+    TRACE( "%s\n", debugstr_w(path->Buffer) );
+
+    driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = mountmgr_ioctl;
+
+    RtlInitUnicodeString( &nameW, device_mountmgrW );
+    RtlInitUnicodeString( &linkW, link_mountmgrW );
+    if (!(status = IoCreateDevice( driver, 0, &nameW, 0, 0, FALSE, &device )))
+        status = IoCreateSymbolicLink( &linkW, &nameW );
+    if (status)
+    {
+        FIXME( "failed to create device error %x\n", status );
+        return status;
+    }
+
+    return status;
+}
diff --git a/dlls/mountmgr.sys/mountmgr.sys.spec b/dlls/mountmgr.sys/mountmgr.sys.spec
new file mode 100644
index 00000000000..76421d7e35b
--- /dev/null
+++ b/dlls/mountmgr.sys/mountmgr.sys.spec
@@ -0,0 +1 @@
+# nothing to export