diff --git a/configure b/configure
index 5392e7850c8267e13dcf720ec7c0f70725201692..87e090861cebaa5306801a116566a2ced6b91d12 100755
--- a/configure
+++ b/configure
@@ -15391,6 +15391,7 @@ wine_fn_config_dll rasapi16.dll16 enable_win16
 wine_fn_config_dll rasapi32 enable_rasapi32 implib
 wine_fn_config_test dlls/rasapi32/tests rasapi32_test
 wine_fn_config_dll rasdlg enable_rasdlg implib
+wine_fn_config_dll regapi enable_regapi
 wine_fn_config_dll resutils enable_resutils implib
 wine_fn_config_dll riched20 enable_riched20 implib
 wine_fn_config_test dlls/riched20/tests riched20_test
diff --git a/configure.ac b/configure.ac
index 5f75b3e1d36a152f9cd1e5cf202fab5943dafc1f..5811bc12af157ccca401fc2bcb041dba1b87701f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2764,6 +2764,7 @@ WINE_CONFIG_DLL(rasapi16.dll16,enable_win16)
 WINE_CONFIG_DLL(rasapi32,,[implib])
 WINE_CONFIG_TEST(dlls/rasapi32/tests)
 WINE_CONFIG_DLL(rasdlg,,[implib])
+WINE_CONFIG_DLL(regapi)
 WINE_CONFIG_DLL(resutils,,[implib])
 WINE_CONFIG_DLL(riched20,,[implib])
 WINE_CONFIG_TEST(dlls/riched20/tests)
diff --git a/dlls/regapi/Makefile.in b/dlls/regapi/Makefile.in
new file mode 100644
index 0000000000000000000000000000000000000000..fabf9df61f03f88dc2a768a6a46fb726013e4bc1
--- /dev/null
+++ b/dlls/regapi/Makefile.in
@@ -0,0 +1,6 @@
+MODULE    = regapi.dll
+
+C_SRCS = \
+	main.c
+
+@MAKE_DLL_RULES@
diff --git a/dlls/regapi/main.c b/dlls/regapi/main.c
new file mode 100644
index 0000000000000000000000000000000000000000..1164e92102a60964bd736ba1332c6cc301a9d513
--- /dev/null
+++ b/dlls/regapi/main.c
@@ -0,0 +1,44 @@
+/*
+ * regapi implementation
+ *
+ * Copyright 2011 Austin English
+ *
+ * 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 "windef.h"
+#include "winbase.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(regapi);
+
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+{
+    TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
+
+    switch (fdwReason)
+    {
+        case DLL_WINE_PREATTACH:
+            return FALSE;    /* prefer native version */
+        case DLL_PROCESS_ATTACH:
+            DisableThreadLibraryCalls(hinstDLL);
+            break;
+        default:
+            break;
+    }
+
+    return TRUE;
+}
diff --git a/dlls/regapi/regapi.spec b/dlls/regapi/regapi.spec
new file mode 100644
index 0000000000000000000000000000000000000000..38366550d637da2b99399e761e015ed5d6bffd57
--- /dev/null
+++ b/dlls/regapi/regapi.spec
@@ -0,0 +1,69 @@
+@ stub RegBuildNumberQuery
+@ stub RegCdCreateA
+@ stub RegCdCreateW
+@ stub RegCdDeleteA
+@ stub RegCdDeleteW
+@ stub RegCdEnumerateA
+@ stub RegCdEnumerateW
+@ stub RegCdQueryA
+@ stub RegCdQueryW
+@ stub RegCloseServer
+@ stub RegConsoleShadowQueryA
+@ stub RegConsoleShadowQueryW
+@ stub RegDefaultUserConfigQueryA
+@ stub RegDefaultUserConfigQueryW
+@ stub RegDenyTSConnectionsPolicy
+@ stub RegFreeUtilityCommandList
+@ stub RegGetMachinePolicy
+@ stub RegGetMachinePolicyEx
+@ stub RegGetTServerVersion
+@ stub RegGetUserConfigFromUserParameters
+@ stub RegGetUserPolicy
+@ stub RegIsMachineInHelpMode
+@ stub RegIsMachinePolicyAllowHelp
+@ stub RegIsTServer
+@ stub RegMergeUserConfigWithUserParameters
+@ stub RegOpenServerA
+@ stub RegOpenServerW
+@ stub RegPdCreateA
+@ stub RegPdCreateW
+@ stub RegPdDeleteA
+@ stub RegPdDeleteW
+@ stub RegPdEnumerateA
+@ stub RegPdEnumerateW
+@ stub RegPdQueryA
+@ stub RegPdQueryW
+@ stub RegQueryOEMId
+@ stub RegQueryUtilityCommandList
+@ stub RegSAMUserConfig
+@ stub RegUserConfigDelete
+@ stub RegUserConfigQuery
+@ stub RegUserConfigRename
+@ stub RegUserConfigSet
+@ stub RegWdCreateA
+@ stub RegWdCreateW
+@ stub RegWdDeleteA
+@ stub RegWdDeleteW
+@ stub RegWdEnumerateA
+@ stub RegWdEnumerateW
+@ stub RegWdQueryA
+@ stub RegWdQueryW
+@ stub RegWinStationAccessCheck
+@ stub RegWinStationCreateA
+@ stub RegWinStationCreateW
+@ stub RegWinStationDeleteA
+@ stub RegWinStationDeleteW
+@ stub RegWinStationEnumerateA
+@ stub RegWinStationEnumerateW
+@ stub RegWinStationQueryA
+@ stub RegWinStationQueryDefaultSecurity
+@ stub RegWinStationQueryEx
+@ stub RegWinStationQueryNumValueW
+@ stub RegWinStationQuerySecurityA
+@ stub RegWinStationQuerySecurityW
+@ stub RegWinStationQueryValueW
+@ stub RegWinStationQueryW
+@ stub RegWinStationSetNumValueW
+@ stub RegWinStationSetSecurityA
+@ stub RegWinStationSetSecurityW
+@ stub WaitForTSConnectionsPolicyChanges