diff --git a/base/system/CMakeLists.txt b/base/system/CMakeLists.txt
index 2afca0775b4..e8372153e04 100644
--- a/base/system/CMakeLists.txt
+++ b/base/system/CMakeLists.txt
@@ -3,6 +3,7 @@ add_subdirectory(autochk)
 add_subdirectory(bootok)
 add_subdirectory(chkdsk)
 add_subdirectory(diskpart)
+add_subdirectory(dllhost)
 add_subdirectory(expand)
 add_subdirectory(format)
 add_subdirectory(lsass)
diff --git a/base/system/dllhost/CMakeLists.txt b/base/system/dllhost/CMakeLists.txt
new file mode 100644
index 00000000000..0fcba164fdc
--- /dev/null
+++ b/base/system/dllhost/CMakeLists.txt
@@ -0,0 +1,5 @@
+
+add_executable(dllhost dllhost.c dllhost.rc)
+set_module_type(dllhost win32gui UNICODE)
+add_importlibs(dllhost msvcrt kernel32 ntdll)
+add_cd_file(TARGET dllhost DESTINATION reactos/system32 FOR all)
diff --git a/base/system/dllhost/dllhost.c b/base/system/dllhost/dllhost.c
new file mode 100644
index 00000000000..52756508193
--- /dev/null
+++ b/base/system/dllhost/dllhost.c
@@ -0,0 +1,30 @@
+/*
+ * PROJECT:     ReactOS DllHost
+ * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE:     COM surrogate.
+ * COPYRIGHT:   Copyright 2018 Eric Kohl
+ */
+
+/* INCLUDES *****************************************************************/
+
+#include <windows.h>
+
+#define NDEBUG
+#include <debug.h>
+
+/* FUNCTIONS ****************************************************************/
+
+INT
+WINAPI
+wWinMain(
+    HINSTANCE hInst,
+    HINSTANCE hPrevInst,
+    LPWSTR lpCmdLine,
+    INT nCmdShow)
+{
+    DPRINT1("dllhost: %S\n", lpCmdLine);
+
+    return 0;
+}
+
+/* EOF */
diff --git a/base/system/dllhost/dllhost.rc b/base/system/dllhost/dllhost.rc
new file mode 100644
index 00000000000..b8ebd5ae6f8
--- /dev/null
+++ b/base/system/dllhost/dllhost.rc
@@ -0,0 +1,4 @@
+#define REACTOS_STR_FILE_DESCRIPTION  "COM Surrogate"
+#define REACTOS_STR_INTERNAL_NAME     "dllhost"
+#define REACTOS_STR_ORIGINAL_FILENAME "dllhost.exe"
+#include <reactos/version.rc>