diff --git a/.gitignore b/.gitignore
index 6be21d51b1e..93227f64dcf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -381,6 +381,9 @@ dlls/psapi/tests/*.ok
 dlls/psapi/tests/psapi_crosstest.exe
 dlls/psapi/tests/testlist.c
 dlls/qcap/version.res
+dlls/qmgrprxy/qmgrprxy.h
+dlls/qmgrprxy/qmgrprxy_i.c
+dlls/qmgrprxy/qmgrprxy_p.c
 dlls/quartz/libquartz.def
 dlls/quartz/tests/*.ok
 dlls/quartz/tests/quartz_crosstest.exe
diff --git a/Makefile.in b/Makefile.in
index 207ce9538cd..18d1b60555d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -357,6 +357,7 @@ ALL_MAKEFILES = \
 	dlls/pstorec/Makefile \
 	dlls/qcap/Makefile \
 	dlls/qmgr/Makefile \
+	dlls/qmgrprxy/Makefile \
 	dlls/quartz/Makefile \
 	dlls/quartz/tests/Makefile \
 	dlls/query/Makefile \
@@ -739,6 +740,7 @@ dlls/psapi/tests/Makefile: dlls/psapi/tests/Makefile.in dlls/Maketest.rules
 dlls/pstorec/Makefile: dlls/pstorec/Makefile.in dlls/Makedll.rules
 dlls/qcap/Makefile: dlls/qcap/Makefile.in dlls/Makedll.rules
 dlls/qmgr/Makefile: dlls/qmgr/Makefile.in dlls/Makedll.rules
+dlls/qmgrprxy/Makefile: dlls/qmgrprxy/Makefile.in dlls/Makedll.rules
 dlls/quartz/Makefile: dlls/quartz/Makefile.in dlls/Makedll.rules
 dlls/quartz/tests/Makefile: dlls/quartz/tests/Makefile.in dlls/Maketest.rules
 dlls/query/Makefile: dlls/query/Makefile.in dlls/Makedll.rules
diff --git a/configure b/configure
index b0202700fd4..0b2e0b49f9f 100755
--- a/configure
+++ b/configure
@@ -20923,6 +20923,8 @@ ac_config_files="$ac_config_files dlls/qcap/Makefile"
 
 ac_config_files="$ac_config_files dlls/qmgr/Makefile"
 
+ac_config_files="$ac_config_files dlls/qmgrprxy/Makefile"
+
 ac_config_files="$ac_config_files dlls/quartz/Makefile"
 
 ac_config_files="$ac_config_files dlls/quartz/tests/Makefile"
@@ -22024,6 +22026,7 @@ do
     "dlls/pstorec/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/pstorec/Makefile" ;;
     "dlls/qcap/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qcap/Makefile" ;;
     "dlls/qmgr/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qmgr/Makefile" ;;
+    "dlls/qmgrprxy/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qmgrprxy/Makefile" ;;
     "dlls/quartz/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/quartz/Makefile" ;;
     "dlls/quartz/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/quartz/tests/Makefile" ;;
     "dlls/query/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/query/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index 8d6e1b4b218..492d36338f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1778,6 +1778,7 @@ AC_CONFIG_FILES([dlls/psapi/tests/Makefile])
 AC_CONFIG_FILES([dlls/pstorec/Makefile])
 AC_CONFIG_FILES([dlls/qcap/Makefile])
 AC_CONFIG_FILES([dlls/qmgr/Makefile])
+AC_CONFIG_FILES([dlls/qmgrprxy/Makefile])
 AC_CONFIG_FILES([dlls/quartz/Makefile])
 AC_CONFIG_FILES([dlls/quartz/tests/Makefile])
 AC_CONFIG_FILES([dlls/query/Makefile])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 8d5c891e97a..d7b0976f5ee 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -163,6 +163,7 @@ BASEDIRS = \
 	pstorec \
 	qcap \
 	qmgr \
+	qmgrprxy \
 	quartz \
 	query \
 	rasapi32 \
diff --git a/dlls/qmgrprxy/Makefile.in b/dlls/qmgrprxy/Makefile.in
new file mode 100644
index 00000000000..18d7b11ce3d
--- /dev/null
+++ b/dlls/qmgrprxy/Makefile.in
@@ -0,0 +1,16 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = qmgrprxy.dll
+IMPORTS   = rpcrt4 kernel32
+EXTRADEFS = -DREGISTER_PROXY_DLL
+
+IDL_I_SRCS = qmgrprxy.idl
+IDL_P_SRCS = qmgrprxy.idl
+
+EXTRA_OBJS = dlldata.o
+
+@MAKE_DLL_RULES@
+
+@DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/qmgrprxy/qmgrprxy.idl b/dlls/qmgrprxy/qmgrprxy.idl
new file mode 100644
index 00000000000..4b47b185209
--- /dev/null
+++ b/dlls/qmgrprxy/qmgrprxy.idl
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2007 Google (Roy Shea)
+ *
+ * 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 "bits.idl"
diff --git a/dlls/qmgrprxy/qmgrprxy.spec b/dlls/qmgrprxy/qmgrprxy.spec
new file mode 100644
index 00000000000..7c7a65bba68
--- /dev/null
+++ b/dlls/qmgrprxy/qmgrprxy.spec
@@ -0,0 +1,5 @@
+@ stdcall -private DllCanUnloadNow()
+@ stdcall -private DllGetClassObject(ptr ptr ptr)
+@ stdcall -private DllRegisterServer()
+@ stdcall -private DllUnregisterServer()
+@ stdcall -private GetProxyDllInfo(ptr ptr)