diff --git a/Makefile.in b/Makefile.in
index 9407b139afc2f69a031aba591f157f8fa42120e6..43359472eaa11bbabb91934a23ca7c71acdfecfc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -266,6 +266,7 @@ ALL_MAKEFILES = \
 	dlls/inetcomm/tests/Makefile \
 	dlls/infosoft/Makefile \
 	dlls/infosoft/tests/Makefile \
+	dlls/initpki/Makefile \
 	dlls/inkobj/Makefile \
 	dlls/inseng/Makefile \
 	dlls/iphlpapi/Makefile \
@@ -659,6 +660,7 @@ dlls/inetcomm/Makefile: dlls/inetcomm/Makefile.in dlls/Makedll.rules
 dlls/inetcomm/tests/Makefile: dlls/inetcomm/tests/Makefile.in dlls/Maketest.rules
 dlls/infosoft/Makefile: dlls/infosoft/Makefile.in dlls/Makedll.rules
 dlls/infosoft/tests/Makefile: dlls/infosoft/tests/Makefile.in dlls/Maketest.rules
+dlls/initpki/Makefile: dlls/initpki/Makefile.in dlls/Makedll.rules
 dlls/inkobj/Makefile: dlls/inkobj/Makefile.in dlls/Makedll.rules
 dlls/inseng/Makefile: dlls/inseng/Makefile.in dlls/Makedll.rules
 dlls/iphlpapi/Makefile: dlls/iphlpapi/Makefile.in dlls/Makedll.rules
diff --git a/configure b/configure
index 4be76fbd08c85c8f592a7009b76ddce751c0fcee..d55dac33299c5a823f60935c16cfb12ca8630eb6 100755
--- a/configure
+++ b/configure
@@ -21383,6 +21383,8 @@ ac_config_files="$ac_config_files dlls/infosoft/Makefile"
 
 ac_config_files="$ac_config_files dlls/infosoft/tests/Makefile"
 
+ac_config_files="$ac_config_files dlls/initpki/Makefile"
+
 ac_config_files="$ac_config_files dlls/inkobj/Makefile"
 
 ac_config_files="$ac_config_files dlls/inseng/Makefile"
@@ -22597,6 +22599,7 @@ do
     "dlls/inetcomm/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inetcomm/tests/Makefile" ;;
     "dlls/infosoft/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/infosoft/Makefile" ;;
     "dlls/infosoft/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/infosoft/tests/Makefile" ;;
+    "dlls/initpki/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/initpki/Makefile" ;;
     "dlls/inkobj/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inkobj/Makefile" ;;
     "dlls/inseng/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inseng/Makefile" ;;
     "dlls/iphlpapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/iphlpapi/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index be7389b49851aa860af04d368e2dc6d9fa3d2321..dfab0d7447867e6c457e2214dc9fb0ad0be30cfb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1765,6 +1765,7 @@ AC_CONFIG_FILES([dlls/inetcomm/Makefile])
 AC_CONFIG_FILES([dlls/inetcomm/tests/Makefile])
 AC_CONFIG_FILES([dlls/infosoft/Makefile])
 AC_CONFIG_FILES([dlls/infosoft/tests/Makefile])
+AC_CONFIG_FILES([dlls/initpki/Makefile])
 AC_CONFIG_FILES([dlls/inkobj/Makefile])
 AC_CONFIG_FILES([dlls/inseng/Makefile])
 AC_CONFIG_FILES([dlls/iphlpapi/Makefile])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 3297a6400fa1a88071624d5e41b59a6c8a9d830c..780d9123aaeb7e58491cf1a32b2449a0425d2b99 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -96,6 +96,7 @@ BASEDIRS = \
 	imm32 \
 	inetcomm \
 	infosoft \
+	initpki \
 	inkobj \
 	inseng \
 	iphlpapi \
diff --git a/dlls/initpki/Makefile.in b/dlls/initpki/Makefile.in
new file mode 100644
index 0000000000000000000000000000000000000000..ece82489b0a1a81a012b1d30bb9ab0a33516104c
--- /dev/null
+++ b/dlls/initpki/Makefile.in
@@ -0,0 +1,13 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = initpki.dll
+IMPORTS   = kernel32
+
+C_SRCS = \
+	main.c
+
+@MAKE_DLL_RULES@
+
+@DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/initpki/initpki.spec b/dlls/initpki/initpki.spec
new file mode 100644
index 0000000000000000000000000000000000000000..51d80bc8ea3d00bdc482dc16af49fbd493251656
--- /dev/null
+++ b/dlls/initpki/initpki.spec
@@ -0,0 +1,4 @@
+@ stub DllInstall
+@ stub DllRegisterServer
+@ stub DllUnregisterServer
+@ stub InitializePKI
diff --git a/dlls/initpki/main.c b/dlls/initpki/main.c
new file mode 100644
index 0000000000000000000000000000000000000000..d936dd819de198f1e6e4c46771fd57e48a8ecc81
--- /dev/null
+++ b/dlls/initpki/main.c
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2008 Maarten Lankhorst
+ *
+ * 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 "config.h"
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(initpki);
+
+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;
+        case DLL_PROCESS_DETACH:
+            break;
+        default:
+            break;
+    }
+    return TRUE;
+}