diff --git a/configure b/configure
index 0307f05cc84..abef0c3e78d 100755
--- a/configure
+++ b/configure
@@ -1099,6 +1099,7 @@ enable_mcicda
 enable_mciqtz32
 enable_mciseq
 enable_mciwave
+enable_mf
 enable_mfplat
 enable_mfreadwrite
 enable_mgmtapi
@@ -17310,6 +17311,7 @@ wine_fn_config_dll mcicda enable_mcicda
 wine_fn_config_dll mciqtz32 enable_mciqtz32
 wine_fn_config_dll mciseq enable_mciseq
 wine_fn_config_dll mciwave enable_mciwave
+wine_fn_config_dll mf enable_mf
 wine_fn_config_dll mfplat enable_mfplat
 wine_fn_config_dll mfreadwrite enable_mfreadwrite
 wine_fn_config_dll mgmtapi enable_mgmtapi
diff --git a/configure.ac b/configure.ac
index 42d8865be4d..2e6cb4c443b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3022,6 +3022,7 @@ WINE_CONFIG_DLL(mcicda)
 WINE_CONFIG_DLL(mciqtz32)
 WINE_CONFIG_DLL(mciseq)
 WINE_CONFIG_DLL(mciwave)
+WINE_CONFIG_DLL(mf)
 WINE_CONFIG_DLL(mfplat)
 WINE_CONFIG_DLL(mfreadwrite)
 WINE_CONFIG_DLL(mgmtapi)
diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in
new file mode 100644
index 00000000000..d7fdb61c092
--- /dev/null
+++ b/dlls/mf/Makefile.in
@@ -0,0 +1,4 @@
+MODULE    = mf.dll
+
+C_SRCS = \
+	main.c
diff --git a/dlls/mf/main.c b/dlls/mf/main.c
new file mode 100644
index 00000000000..1b223adc119
--- /dev/null
+++ b/dlls/mf/main.c
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2015 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"
+
+BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
+{
+    switch (reason)
+    {
+        case DLL_WINE_PREATTACH:
+            return FALSE;    /* prefer native version */
+        case DLL_PROCESS_ATTACH:
+            DisableThreadLibraryCalls(instance);
+            break;
+    }
+
+    return TRUE;
+}
diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec
new file mode 100644
index 00000000000..10b682a21bd
--- /dev/null
+++ b/dlls/mf/mf.spec
@@ -0,0 +1,83 @@
+@ stub AppendPropVariant
+@ stub ConvertPropVariant
+@ stub CopyPropertyStore
+@ stub CreateNamedPropertyStore
+@ stub DllCanUnloadNow
+@ stub DllGetClassObject
+@ stub DllRegisterServer
+@ stub DllUnregisterServer
+@ stub ExtractPropVariant
+@ stub MFCreate3GPMediaSink
+@ stub MFCreateASFByteStreamPlugin
+@ stub MFCreateASFContentInfo
+@ stub MFCreateASFIndexer
+@ stub MFCreateASFIndexerByteStream
+@ stub MFCreateASFMediaSink
+@ stub MFCreateASFMediaSinkActivate
+@ stub MFCreateASFMultiplexer
+@ stub MFCreateASFProfile
+@ stub MFCreateASFProfileFromPresentationDescriptor
+@ stub MFCreateASFSplitter
+@ stub MFCreateASFStreamSelector
+@ stub MFCreateASFStreamingMediaSink
+@ stub MFCreateASFStreamingMediaSinkActivate
+@ stub MFCreateAggregateSource
+@ stub MFCreateAppSourceProxy
+@ stub MFCreateAudioRenderer
+@ stub MFCreateAudioRendererActivate
+@ stub MFCreateByteCacheFile
+@ stub MFCreateCacheManager
+@ stub MFCreateCredentialCache
+@ stub MFCreateDeviceSource
+@ stub MFCreateDeviceSourceActivate
+@ stub MFCreateDrmNetNDSchemePlugin
+@ stub MFCreateFileBlockMap
+@ stub MFCreateFileSchemePlugin
+@ stub MFCreateHttpSchemePlugin
+@ stub MFCreateLPCMByteStreamPlugin
+@ stub MFCreateMP3ByteStreamPlugin
+@ stub MFCreateMP3MediaSink
+@ stub MFCreateMPEG4MediaSink
+@ stub MFCreateMediaProcessor
+@ stub MFCreateMediaSession
+@ stub MFCreateNSCByteStreamPlugin
+@ stub MFCreateNetSchemePlugin
+@ stub MFCreatePMPHost
+@ stub MFCreatePMPMediaSession
+@ stub MFCreatePMPServer
+@ stub MFCreatePresentationClock
+@ stub MFCreatePresentationDescriptorFromASFProfile
+@ stub MFCreateProxyLocator
+@ stub MFCreateRemoteDesktopPlugin
+@ stub MFCreateSAMIByteStreamPlugin
+@ stub MFCreateSampleCopierMFT
+@ stub MFCreateSampleGrabberSinkActivate
+@ stub MFCreateSecureHttpSchemePlugin
+@ stub MFCreateSequencerSegmentOffset
+@ stub MFCreateSequencerSource
+@ stub MFCreateSequencerSourceRemoteStream
+@ stub MFCreateSimpleTypeHandler
+@ stub MFCreateSourceResolver
+@ stub MFCreateStandardQualityManager
+@ stub MFCreateTopoLoader
+@ stub MFCreateTopology
+@ stub MFCreateTopologyNode
+@ stub MFCreateTranscodeProfile
+@ stub MFCreateTranscodeSinkActivate
+@ stub MFCreateTranscodeTopology
+@ stub MFCreateUrlmonSchemePlugin
+@ stub MFCreateVideoRenderer
+@ stub MFCreateVideoRendererActivate
+@ stub MFCreateWMAEncoderActivate
+@ stub MFCreateWMVEncoderActivate
+@ stub MFEnumDeviceSources
+@ stub MFGetMultipleServiceProviders
+@ stub MFGetService
+@ stub MFGetSupportedMimeTypes
+@ stub MFGetSupportedSchemes
+@ stub MFGetTopoNodeCurrentType
+@ stub MFReadSequencerSegmentOffset
+@ stub MFRequireProtectedEnvironment
+@ stub MFShutdownObject
+@ stub MFTranscodeGetAudioOutputAvailableTypes
+@ stub MergePropertyStore