diff --git a/reactos/baseaddress.rbuild b/reactos/baseaddress.rbuild
index aa7fd2c4136..2f0ab96bd36 100644
--- a/reactos/baseaddress.rbuild
+++ b/reactos/baseaddress.rbuild
@@ -95,6 +95,7 @@
   <property name="BASEADDRESS_ACLUI" value="0x71550000" />
   <property name="BASEADDRESS_DHCPCSVC" value="0x71650000" />
   <property name="BASEADDRESS_SHDOCVW" value="0x71700000" />
+  <property name="BASEADDRESS_ACTXPRXY" value="0x71800000" />
   <property name="BASEADDRESS_MSWSOCK" value="0x71a30000" />
   <property name="BASEADDRESS_WSOCK32" value="0x71ab0000" />
   <property name="BASEADDRESS_ACLEDIT" value="0x71b70000" />
diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff
index d2075526c87..62878cb8e8d 100644
--- a/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@ -240,6 +240,7 @@ dll\win32\aclui\aclui.dll                           1
 dll\win32\activeds\activeds.dll                     1
 dll\win32\advapi32\advapi32.dll                     1
 dll\win32\advpack\advpack.dll                       1
+dll\win32\actxprxy\actxprxy.dll                     1
 dll\win32\atl\atl.dll                               1
 dll\win32\authz\authz.dll                           1
 dll\win32\avifil32\avifil32.dll                     1
diff --git a/reactos/dll/win32/actxprxy/actxprxy.rbuild b/reactos/dll/win32/actxprxy/actxprxy.rbuild
new file mode 100644
index 00000000000..da8982293ef
--- /dev/null
+++ b/reactos/dll/win32/actxprxy/actxprxy.rbuild
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<group>
+<module name="actxprxy" type="win32dll" baseaddress="${BASEADDRESS_ACTXPRXY}" installbase="system32" entrypoint="0" installname="actxprxy.dll" allowwarnings="true">
+	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
+	<importlibrary definition="actxprxy.spec" />
+	<include base="actxprxy">.</include>
+	<include base="ReactOS">include/reactos/wine</include>
+	<include base="actxprxy" root="intermediate">.</include>
+	<define name="__WINESRC__" />
+	<library>wine</library>
+	<library>actxprxy_interface</library>
+	<library>actxprxy_proxy</library>
+	<library>kernel32</library>
+	<library>ntdll</library>
+	<library>rpcrt4</library>
+	<library>pseh</library>
+	<file>usrmarshal.c</file>
+	<compilerflag>-fno-unit-at-a-time</compilerflag>
+</module>
+<module name="actxprxy_interface" type="idlinterface">
+	<file>actxprxy_servprov.idl</file>
+</module>
+<module name="actxprxy_proxy" type="rpcproxy">
+	<define name="__WINESRC__" />
+	<define name="REGISTER_PROXY_DLL" />
+	<define name="PROXY_CLSID_IS">"{ 0xb8da6310, 0xe19b, 0x11d0, { 0x93, 0x3c, 0x00, 0xa0, 0xc9, 0x0d, 0xca, 0xa9 } }"</define>
+	<file>actxprxy_servprov.idl</file>
+</module>
+</group>
diff --git a/reactos/dll/win32/actxprxy/actxprxy.spec b/reactos/dll/win32/actxprxy/actxprxy.spec
new file mode 100644
index 00000000000..a1096f14f2b
--- /dev/null
+++ b/reactos/dll/win32/actxprxy/actxprxy.spec
@@ -0,0 +1,5 @@
+3 stdcall -private GetProxyDllInfo(ptr ptr)
+@ stdcall -private DllCanUnloadNow()
+@ stdcall -private DllGetClassObject(ptr ptr ptr)
+@ stdcall -private DllRegisterServer()
+@ stdcall -private DllUnregisterServer()
diff --git a/reactos/dll/win32/actxprxy/actxprxy_servprov.idl b/reactos/dll/win32/actxprxy/actxprxy_servprov.idl
new file mode 100644
index 00000000000..08b26efcc19
--- /dev/null
+++ b/reactos/dll/win32/actxprxy/actxprxy_servprov.idl
@@ -0,0 +1 @@
+#include "servprov.idl"
diff --git a/reactos/dll/win32/actxprxy/usrmarshal.c b/reactos/dll/win32/actxprxy/usrmarshal.c
new file mode 100644
index 00000000000..9d5318fcec5
--- /dev/null
+++ b/reactos/dll/win32/actxprxy/usrmarshal.c
@@ -0,0 +1,64 @@
+/*
+ * Miscellaneous Marshaling Routines
+ *
+ * Copyright 2006 Robert Shearman (for CodeWeavers)
+ *
+ * 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 <string.h>
+
+#define COBJMACROS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winerror.h"
+#include "objbase.h"
+#include "servprov.h"
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(actxprxy);
+
+HRESULT CALLBACK IServiceProvider_QueryService_Proxy(
+    IServiceProvider* This,
+    REFGUID guidService,
+    REFIID riid,
+    void** ppvObject)
+{
+    TRACE("(%p, %s, %s, %p)\n", This, debugstr_guid(guidService),
+        debugstr_guid(riid), ppvObject);
+
+    return IServiceProvider_RemoteQueryService_Proxy(This, guidService, riid,
+        (IUnknown **)ppvObject);
+}
+
+HRESULT __RPC_STUB IServiceProvider_QueryService_Stub(
+    IServiceProvider* This,
+    REFGUID guidService,
+    REFIID riid,
+    IUnknown** ppvObject)
+{
+    TRACE("(%p, %s, %s, %p)\n", This, debugstr_guid(guidService),
+        debugstr_guid(riid), ppvObject);
+
+    return IServiceProvider_QueryService(This, guidService, riid,
+        (void **)ppvObject);
+}
diff --git a/reactos/dll/win32/win32.rbuild b/reactos/dll/win32/win32.rbuild
index e332d689279..acda17deaf7 100644
--- a/reactos/dll/win32/win32.rbuild
+++ b/reactos/dll/win32/win32.rbuild
@@ -16,6 +16,9 @@
 <directory name="advpack">
 	<xi:include href="advpack/advpack.rbuild" />
 </directory>
+<directory name="actxprxy">
+	<xi:include href="actxprxy/actxprxy.rbuild" />
+</directory>
 <directory name="atl">
 	<xi:include href="atl/atl.rbuild" />
 </directory>