diff --git a/configure b/configure
index 555bc0bdca6..9147bc2ab32 100755
--- a/configure
+++ b/configure
@@ -17168,6 +17168,14 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winejoystick.drv/Makefile: dlls/winejoystick.drv/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/winejoystick.drv/Makefile"
 
+ALL_MAKEFILES="$ALL_MAKEFILES \\
+	dlls/winemapi/Makefile"
+test "x$enable_winemapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	winemapi"
+ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+dlls/winemapi/Makefile: dlls/winemapi/Makefile.in dlls/Makedll.rules"
+ac_config_files="$ac_config_files dlls/winemapi/Makefile"
+
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/winemp3.acm/Makefile"
 test "x$enable_winemp3_acm" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
@@ -19276,6 +19284,7 @@ do
     "dlls/wineesd.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wineesd.drv/Makefile" ;;
     "dlls/winejack.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winejack.drv/Makefile" ;;
     "dlls/winejoystick.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winejoystick.drv/Makefile" ;;
+    "dlls/winemapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winemapi/Makefile" ;;
     "dlls/winemp3.acm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winemp3.acm/Makefile" ;;
     "dlls/winenas.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winenas.drv/Makefile" ;;
     "dlls/wineoss.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wineoss.drv/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index e966142f652..0264a073194 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2531,6 +2531,7 @@ WINE_CONFIG_MAKEFILE([dlls/winedos/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DL
 WINE_CONFIG_MAKEFILE([dlls/wineesd.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/winejack.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/winejoystick.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/winemapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/winemp3.acm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/winenas.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/wineoss.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
diff --git a/dlls/winemapi/Makefile.in b/dlls/winemapi/Makefile.in
new file mode 100644
index 00000000000..6a4ec212c62
--- /dev/null
+++ b/dlls/winemapi/Makefile.in
@@ -0,0 +1,13 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = winemapi.dll
+IMPORTS   = shlwapi shell32 kernel32
+
+C_SRCS = \
+	main.c
+
+@MAKE_DLL_RULES@
+
+@DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/winemapi/main.c b/dlls/winemapi/main.c
new file mode 100644
index 00000000000..e4d4e551d57
--- /dev/null
+++ b/dlls/winemapi/main.c
@@ -0,0 +1,39 @@
+/*
+ *             Wine MAPI provider
+ *
+ * Copyright 2009 Owen Rudge for CodeWeavers
+ *
+ * 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 <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "objbase.h"
+#include "mapi.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(winemapi);
+
+/***********************************************************************
+ *              DllMain (MAPI32.init)
+ */
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
+{
+    TRACE("(%p,%d,%p)\n", hinstDLL, fdwReason, fImpLoad);
+    return TRUE;
+}
diff --git a/dlls/winemapi/winemapi.spec b/dlls/winemapi/winemapi.spec
new file mode 100644
index 00000000000..7091f72c060
--- /dev/null
+++ b/dlls/winemapi/winemapi.spec
@@ -0,0 +1,11 @@
+@ stub MAPIAddress
+@ stub MAPIDeleteMail
+@ stub MAPIDetails
+@ stub MAPIFindNext
+@ stub MAPILogon
+@ stub MAPILogoff
+@ stub MAPIReadMail
+@ stub MAPIResolveName
+@ stub MAPISaveMail
+@ stub MAPISendDocuments
+@ stub MAPISendMail