diff --git a/Makefile.in b/Makefile.in
index 4b4fcf1f8f3..c7a53064168 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -188,6 +188,7 @@ ALL_MAKEFILES = \
 	dlls/crtdll/Makefile \
 	dlls/crypt32/Makefile \
 	dlls/crypt32/tests/Makefile \
+	dlls/cryptdlg/Makefile \
 	dlls/cryptdll/Makefile \
 	dlls/cryptnet/Makefile \
 	dlls/cryptnet/tests/Makefile \
@@ -579,6 +580,7 @@ dlls/credui/tests/Makefile: dlls/credui/tests/Makefile.in dlls/Maketest.rules
 dlls/crtdll/Makefile: dlls/crtdll/Makefile.in dlls/Makedll.rules
 dlls/crypt32/Makefile: dlls/crypt32/Makefile.in dlls/Makedll.rules
 dlls/crypt32/tests/Makefile: dlls/crypt32/tests/Makefile.in dlls/Maketest.rules
+dlls/cryptdlg/Makefile: dlls/cryptdlg/Makefile.in dlls/Makedll.rules
 dlls/cryptdll/Makefile: dlls/cryptdll/Makefile.in dlls/Makedll.rules
 dlls/cryptnet/Makefile: dlls/cryptnet/Makefile.in dlls/Makedll.rules
 dlls/cryptnet/tests/Makefile: dlls/cryptnet/tests/Makefile.in dlls/Maketest.rules
diff --git a/configure b/configure
index 0eb274a56ac..758a8512f8e 100755
--- a/configure
+++ b/configure
@@ -21227,6 +21227,8 @@ ac_config_files="$ac_config_files dlls/crypt32/Makefile"
 
 ac_config_files="$ac_config_files dlls/crypt32/tests/Makefile"
 
+ac_config_files="$ac_config_files dlls/cryptdlg/Makefile"
+
 ac_config_files="$ac_config_files dlls/cryptdll/Makefile"
 
 ac_config_files="$ac_config_files dlls/cryptnet/Makefile"
@@ -22515,6 +22517,7 @@ do
     "dlls/crtdll/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/crtdll/Makefile" ;;
     "dlls/crypt32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/crypt32/Makefile" ;;
     "dlls/crypt32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/crypt32/tests/Makefile" ;;
+    "dlls/cryptdlg/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptdlg/Makefile" ;;
     "dlls/cryptdll/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptdll/Makefile" ;;
     "dlls/cryptnet/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptnet/Makefile" ;;
     "dlls/cryptnet/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptnet/tests/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index a9252e08379..bb8aac48c80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1687,6 +1687,7 @@ AC_CONFIG_FILES([dlls/credui/tests/Makefile])
 AC_CONFIG_FILES([dlls/crtdll/Makefile])
 AC_CONFIG_FILES([dlls/crypt32/Makefile])
 AC_CONFIG_FILES([dlls/crypt32/tests/Makefile])
+AC_CONFIG_FILES([dlls/cryptdlg/Makefile])
 AC_CONFIG_FILES([dlls/cryptdll/Makefile])
 AC_CONFIG_FILES([dlls/cryptnet/Makefile])
 AC_CONFIG_FILES([dlls/cryptnet/tests/Makefile])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index d29aafbae83..6577b2ab77e 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -38,6 +38,7 @@ BASEDIRS = \
 	credui \
 	crtdll \
 	crypt32 \
+	cryptdlg \
 	cryptdll \
 	cryptnet \
 	ctapi32 \
diff --git a/dlls/cryptdlg/Makefile.in b/dlls/cryptdlg/Makefile.in
new file mode 100644
index 00000000000..9c936303435
--- /dev/null
+++ b/dlls/cryptdlg/Makefile.in
@@ -0,0 +1,13 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = cryptdlg.dll
+IMPORTS   = kernel32
+
+C_SRCS = \
+	main.c
+
+@MAKE_DLL_RULES@
+
+@DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/cryptdlg/cryptdlg.spec b/dlls/cryptdlg/cryptdlg.spec
new file mode 100644
index 00000000000..1b80d406607
--- /dev/null
+++ b/dlls/cryptdlg/cryptdlg.spec
@@ -0,0 +1,21 @@
+1 stub CertConfigureTrustA
+2 stub CertConfigureTrustW
+3 stub CertTrustCertPolicy
+4 stub CertTrustCleanup
+5 stub CertTrustFinalPolicy
+6 stub CertTrustInit
+7 stub DecodeAttrSequence
+8 stub DecodeRecipientID
+9 stub EncodeAttrSequence
+10 stub EncodeRecipientID
+11 stub FormatPKIXEmailProtection
+12 stub FormatVerisignExtension
+13 stub CertModifyCertificatesToTrust
+14 stub CertSelectCertificateA
+15 stub CertSelectCertificateW
+16 stub CertViewPropertiesA
+17 stub CertViewPropertiesW
+18 stub DllRegisterServer
+19 stub DllUnregisterServer
+20 stub GetFriendlyNameOfCertA
+21 stub GetFriendlyNameOfCertW
diff --git a/dlls/cryptdlg/main.c b/dlls/cryptdlg/main.c
new file mode 100644
index 00000000000..eec0fa09550
--- /dev/null
+++ b/dlls/cryptdlg/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(cryptdlg);
+
+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;
+}