diff --git a/configure b/configure
index 533bf151dde..6689b65d1ec 100755
--- a/configure
+++ b/configure
@@ -1327,6 +1327,7 @@ enable_webservices
 enable_wer
 enable_wevtapi
 enable_wiaservc
+enable_wimgapi
 enable_windowscodecs
 enable_windowscodecsext
 enable_winealsa_drv
@@ -17878,6 +17879,7 @@ wine_fn_config_test dlls/wer/tests wer_test
 wine_fn_config_dll wevtapi enable_wevtapi
 wine_fn_config_dll wiaservc enable_wiaservc clean
 wine_fn_config_test dlls/wiaservc/tests wiaservc_test
+wine_fn_config_dll wimgapi enable_wimgapi
 wine_fn_config_dll win32s16.dll16 enable_win16
 wine_fn_config_dll win87em.dll16 enable_win16
 wine_fn_config_dll winaspi.dll16 enable_win16
diff --git a/configure.ac b/configure.ac
index 5ab2d69216c..030aa32eb29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3389,6 +3389,7 @@ WINE_CONFIG_TEST(dlls/wer/tests)
 WINE_CONFIG_DLL(wevtapi)
 WINE_CONFIG_DLL(wiaservc,,[clean])
 WINE_CONFIG_TEST(dlls/wiaservc/tests)
+WINE_CONFIG_DLL(wimgapi)
 WINE_CONFIG_DLL(win32s16.dll16,enable_win16)
 WINE_CONFIG_DLL(win87em.dll16,enable_win16)
 WINE_CONFIG_DLL(winaspi.dll16,enable_win16)
diff --git a/dlls/wimgapi/Makefile.in b/dlls/wimgapi/Makefile.in
new file mode 100644
index 00000000000..7fa2db82d19
--- /dev/null
+++ b/dlls/wimgapi/Makefile.in
@@ -0,0 +1,4 @@
+MODULE = wimgapi.dll
+
+C_SRCS = \
+	main.c
diff --git a/dlls/wimgapi/main.c b/dlls/wimgapi/main.c
new file mode 100644
index 00000000000..5ac8a66120c
--- /dev/null
+++ b/dlls/wimgapi/main.c
@@ -0,0 +1,46 @@
+/*
+ *
+ * wimgapi implementation
+ *
+ * Copyright 2015 Stefan Leichter
+ *
+ * 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(wimgapi);
+
+BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
+{
+    TRACE("(0x%p, %d, %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;
+}
diff --git a/dlls/wimgapi/wimgapi.spec b/dlls/wimgapi/wimgapi.spec
new file mode 100644
index 00000000000..b4679898ee4
--- /dev/null
+++ b/dlls/wimgapi/wimgapi.spec
@@ -0,0 +1,42 @@
+@ stub -private DllCanUnloadNow
+@ stdcall -private DllMain(long long ptr)
+@ stub WIMApplyImage
+@ stub WIMCaptureImage
+@ stub WIMCloseHandle
+@ stub WIMCommitImageHandle
+@ stub WIMCopyFile
+@ stub WIMCreateFile
+@ stub WIMCreateImageFile
+@ stub WIMDeleteImage
+@ stub WIMDeleteImageMounts
+@ stub WIMEnumImageFiles
+@ stub WIMExportImage
+@ stub WIMExtractImagePath
+@ stub WIMFindFirstImageFile
+@ stub WIMFindNextImageFile
+@ stub WIMGetAttributes
+@ stub WIMGetImageCount
+@ stub WIMGetImageInformation
+@ stub WIMGetMessageCallbackCount
+@ stub WIMGetMountedImageHandle
+@ stub WIMGetMountedImageInfo
+@ stub WIMGetMountedImageInfoFromFile
+@ stub WIMGetMountedImages
+@ stub WIMInitFileIOCallbacks
+@ stub WIMLoadImage
+@ stub WIMMountImage
+@ stub WIMMountImageHandle
+@ stub WIMReadImageFile
+@ stub WIMRegisterLogFile
+@ stub WIMRegisterMessageCallback
+@ stub WIMRemountImage
+@ stub WIMSetBootImage
+@ stub WIMSetFileIOCallbackTemporaryPath
+@ stub WIMSetImageInformation
+@ stub WIMSetReferenceFile
+@ stub WIMSetTemporaryFile
+@ stub WIMSplitFile
+@ stub WIMUmountImage
+@ stub WIMUmountImageHandle
+@ stub WIMUnregisterLogFile
+@ stub WIMUnregisterMessageCallback