diff --git a/configure b/configure
index ed4535034eb..a38763c4459 100755
--- a/configure
+++ b/configure
@@ -1285,6 +1285,7 @@ enable_ext_ms_win_security_credui_l1_1_0
 enable_ext_ms_win_security_cryptui_l1_1_0
 enable_ext_ms_win_uxtheme_themes_l1_1_0
 enable_faultrep
+enable_feclient
 enable_fltlib
 enable_fltmgr_sys
 enable_fntcache
@@ -18694,6 +18695,7 @@ wine_fn_config_makefile dlls/ext-ms-win-security-cryptui-l1-1-0 enable_ext_ms_wi
 wine_fn_config_makefile dlls/ext-ms-win-uxtheme-themes-l1-1-0 enable_ext_ms_win_uxtheme_themes_l1_1_0
 wine_fn_config_makefile dlls/faultrep enable_faultrep
 wine_fn_config_makefile dlls/faultrep/tests enable_tests
+wine_fn_config_makefile dlls/feclient enable_feclient
 wine_fn_config_makefile dlls/fltlib enable_fltlib
 wine_fn_config_makefile dlls/fltmgr.sys enable_fltmgr_sys
 wine_fn_config_makefile dlls/fntcache enable_fntcache
diff --git a/configure.ac b/configure.ac
index f30607827f3..5d60559ff66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3291,6 +3291,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-cryptui-l1-1-0)
 WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-uxtheme-themes-l1-1-0)
 WINE_CONFIG_MAKEFILE(dlls/faultrep)
 WINE_CONFIG_MAKEFILE(dlls/faultrep/tests)
+WINE_CONFIG_MAKEFILE(dlls/feclient)
 WINE_CONFIG_MAKEFILE(dlls/fltlib)
 WINE_CONFIG_MAKEFILE(dlls/fltmgr.sys)
 WINE_CONFIG_MAKEFILE(dlls/fntcache)
diff --git a/dlls/feclient/Makefile.in b/dlls/feclient/Makefile.in
new file mode 100644
index 00000000000..d3eeefb0cc4
--- /dev/null
+++ b/dlls/feclient/Makefile.in
@@ -0,0 +1,4 @@
+MODULE    = feclient.dll
+
+C_SRCS = \
+	main.c
diff --git a/dlls/feclient/feclient.spec b/dlls/feclient/feclient.spec
new file mode 100644
index 00000000000..3534610daf6
--- /dev/null
+++ b/dlls/feclient/feclient.spec
@@ -0,0 +1,50 @@
+@ stub EfsUtilGetCurrentKey
+@ stub EdpAllowFileAccessForProcess
+@ stub EdpConsumerCredentialCreate
+@ stub EdpConsumerCredentialQuery
+@ stub EdpContainerizeFile
+@ stub EdpCredentialCreate
+@ stub EdpCredentialDelete
+@ stub EdpCredentialExists
+@ stub EdpCredentialQuery
+@ stub EdpDecontainerizeFile
+@ stub EdpDplPolicyEnabledForUser
+@ stub EdpDplStartCredServiceIfDplEnabledForUser
+@ stub EdpDplUpgradePinInfo
+@ stub EdpDplUpgradeVerifyUser
+@ stub EdpDplUserCredentialsSet
+@ stub EdpDplUserUnlockComplete
+@ stub EdpDplUserUnlockStart
+@ stub EdpFree
+@ stub EdpGetContainerIdentity
+@ stub EdpGetCredServiceState
+@ stub EdpIsConsumerDataProtectionEnforced
+@ stub EdpIsConsumerDataProtectionSupported
+@ stub EdpPurgeAppLearningEvents
+@ stub EdpQueryCredServiceInfo
+@ stub EdpQueryDplEnforcedPolicyOwnerIds
+@ stub EdpQueryRevokedPolicyOwnerIds
+@ stub EdpRmsClearKeys
+@ stub EdpSetCredServiceInfo
+@ stub EdpUnprotectFile
+@ stub EdpWriteLogSiteLearningEvents
+@ stub EfsClientCloseFileRaw
+@ stub EfsClientCopyFileRaw
+@ stub EfsClientDecryptFile
+@ stub EfsClientDuplicateEncryptionInfo
+@ stub EfsClientEncryptFileEx
+@ stub EfsClientFileEncryptionStatus
+@ stub EfsClientFreeKeyInfo
+@ stub EfsClientFreeProtectorList
+@ stub EfsClientGetEncryptedFileVersion
+@ stub EfsClientGetKeyInfo
+@ stub EfsClientOpenFileRaw
+@ stub EfsClientQueryProtectors
+@ stub EfsClientReadFileRaw
+@ stub EfsClientWriteFileRaw
+@ stub EfsClientWriteFileWithHeaderRaw
+@ stub EfsReprotectFile
+@ stub FeClientInitialize
+@ stub GetLockSessionUnwrappedKey
+@ stub GetLockSessionWrappedKey
+@ stub OefsCheckSupport
diff --git a/dlls/feclient/main.c b/dlls/feclient/main.c
new file mode 100644
index 00000000000..91aed70ec88
--- /dev/null
+++ b/dlls/feclient/main.c
@@ -0,0 +1,45 @@
+/*
+ * feclient API
+ *
+ * Copyright 2016 Michael Müller
+ *
+ * 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(feclient);
+
+BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *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;
+}