diff --git a/configure b/configure
index de031517106..d09438e40da 100755
--- a/configure
+++ b/configure
@@ -932,6 +932,7 @@ enable_crtdll
 enable_crypt32
 enable_cryptdlg
 enable_cryptdll
+enable_cryptext
 enable_cryptnet
 enable_cryptui
 enable_ctapi32
@@ -16861,6 +16862,7 @@ wine_fn_config_dll crypt32 enable_crypt32 implib,po
 wine_fn_config_test dlls/crypt32/tests crypt32_test
 wine_fn_config_dll cryptdlg enable_cryptdlg po
 wine_fn_config_dll cryptdll enable_cryptdll implib
+wine_fn_config_dll cryptext enable_cryptext
 wine_fn_config_dll cryptnet enable_cryptnet implib
 wine_fn_config_test dlls/cryptnet/tests cryptnet_test
 wine_fn_config_dll cryptui enable_cryptui implib,po
diff --git a/configure.ac b/configure.ac
index 4ee81339a56..04bcbd86c14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2741,6 +2741,7 @@ WINE_CONFIG_DLL(crypt32,,[implib,po])
 WINE_CONFIG_TEST(dlls/crypt32/tests)
 WINE_CONFIG_DLL(cryptdlg,,[po])
 WINE_CONFIG_DLL(cryptdll,,[implib])
+WINE_CONFIG_DLL(cryptext)
 WINE_CONFIG_DLL(cryptnet,,[implib])
 WINE_CONFIG_TEST(dlls/cryptnet/tests)
 WINE_CONFIG_DLL(cryptui,,[implib,po])
diff --git a/dlls/cryptext/Makefile.in b/dlls/cryptext/Makefile.in
new file mode 100644
index 00000000000..e1a46ba677c
--- /dev/null
+++ b/dlls/cryptext/Makefile.in
@@ -0,0 +1,4 @@
+MODULE = cryptext.dll
+
+C_SRCS = \
+	cryptext_main.c
diff --git a/dlls/cryptext/cryptext.spec b/dlls/cryptext/cryptext.spec
new file mode 100644
index 00000000000..b0e920e325a
--- /dev/null
+++ b/dlls/cryptext/cryptext.spec
@@ -0,0 +1,30 @@
+@ stub CryptExtAddCER
+@ stub CryptExtAddCERW
+@ stub CryptExtAddCRL
+@ stub CryptExtAddCRLW
+@ stub CryptExtAddCTL
+@ stub CryptExtAddCTLW
+@ stub CryptExtAddP7R
+@ stub CryptExtAddP7RW
+@ stub CryptExtAddPFX
+@ stub CryptExtAddPFXW
+@ stub CryptExtAddSPC
+@ stub CryptExtAddSPCW
+@ stub CryptExtOpenCAT
+@ stub CryptExtOpenCATW
+@ stub CryptExtOpenCER
+@ stub CryptExtOpenCERW
+@ stub CryptExtOpenCRL
+@ stub CryptExtOpenCRLW
+@ stub CryptExtOpenCTL
+@ stub CryptExtOpenCTLW
+@ stub CryptExtOpenP7R
+@ stub CryptExtOpenP7RW
+@ stub CryptExtOpenPKCS7
+@ stub CryptExtOpenPKCS7W
+@ stub CryptExtOpenSTR
+@ stub CryptExtOpenSTRW
+@ stub DllCanUnloadNow
+@ stub DllGetClassObject
+@ stub DllRegisterServer
+@ stub DllUnregisterServer
diff --git a/dlls/cryptext/cryptext_main.c b/dlls/cryptext/cryptext_main.c
new file mode 100644
index 00000000000..75ede4ebf41
--- /dev/null
+++ b/dlls/cryptext/cryptext_main.c
@@ -0,0 +1,45 @@
+/*
+ * Crypto Shell Extensions
+ *
+ * Copyright 2014 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 "config.h"
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(cryptext);
+
+BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
+{
+    TRACE("(%p, %u, %p)\n", instance, reason, reserved);
+
+    switch (reason)
+    {
+        case DLL_WINE_PREATTACH:
+            return FALSE;    /* prefer native version */
+        case DLL_PROCESS_ATTACH:
+            DisableThreadLibraryCalls(instance);
+            break;
+    }
+
+    return TRUE;
+}