diff --git a/Makefile.in b/Makefile.in
index d504ac6f24a..774249cb6a8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -233,6 +233,7 @@ ALL_MAKEFILES = \
 	dlls/dxerr8/Makefile \
 	dlls/dxerr9/Makefile \
 	dlls/dxguid/Makefile \
+	dlls/faultrep/Makefile \
 	dlls/gdi32/Makefile \
 	dlls/gdi32/tests/Makefile \
 	dlls/gdiplus/Makefile \
@@ -598,6 +599,7 @@ dlls/dxdiagn/Makefile: dlls/dxdiagn/Makefile.in dlls/Makedll.rules
 dlls/dxerr8/Makefile: dlls/dxerr8/Makefile.in dlls/Makeimplib.rules
 dlls/dxerr9/Makefile: dlls/dxerr9/Makefile.in dlls/Makeimplib.rules
 dlls/dxguid/Makefile: dlls/dxguid/Makefile.in dlls/Makeimplib.rules
+dlls/faultrep/Makefile: dlls/faultrep/Makefile.in dlls/Makedll.rules
 dlls/gdi32/Makefile: dlls/gdi32/Makefile.in dlls/Makedll.rules
 dlls/gdi32/tests/Makefile: dlls/gdi32/tests/Makefile.in dlls/Maketest.rules
 dlls/gdiplus/Makefile: dlls/gdiplus/Makefile.in dlls/Makedll.rules
diff --git a/configure b/configure
index b9ea64f4500..23dfa4b23fa 100755
--- a/configure
+++ b/configure
@@ -20416,6 +20416,8 @@ ac_config_files="$ac_config_files dlls/dxerr9/Makefile"
 
 ac_config_files="$ac_config_files dlls/dxguid/Makefile"
 
+ac_config_files="$ac_config_files dlls/faultrep/Makefile"
+
 ac_config_files="$ac_config_files dlls/gdi32/Makefile"
 
 ac_config_files="$ac_config_files dlls/gdi32/tests/Makefile"
@@ -21607,6 +21609,7 @@ do
     "dlls/dxerr8/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxerr8/Makefile" ;;
     "dlls/dxerr9/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxerr9/Makefile" ;;
     "dlls/dxguid/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxguid/Makefile" ;;
+    "dlls/faultrep/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/faultrep/Makefile" ;;
     "dlls/gdi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi32/Makefile" ;;
     "dlls/gdi32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi32/tests/Makefile" ;;
     "dlls/gdiplus/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdiplus/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index ba5b4dae1ec..ec6ff7160ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1634,6 +1634,7 @@ AC_CONFIG_FILES([dlls/dxdiagn/Makefile])
 AC_CONFIG_FILES([dlls/dxerr8/Makefile])
 AC_CONFIG_FILES([dlls/dxerr9/Makefile])
 AC_CONFIG_FILES([dlls/dxguid/Makefile])
+AC_CONFIG_FILES([dlls/faultrep/Makefile])
 AC_CONFIG_FILES([dlls/gdi32/Makefile])
 AC_CONFIG_FILES([dlls/gdi32/tests/Makefile])
 AC_CONFIG_FILES([dlls/gdiplus/Makefile])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 2fdc360cdf7..2a7b7b82889 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -73,6 +73,7 @@ BASEDIRS = \
 	dswave \
 	dwmapi \
 	dxdiagn \
+	faultrep \
 	gdi32 \
 	gdiplus \
 	gphoto2.ds \
diff --git a/dlls/faultrep/Makefile.in b/dlls/faultrep/Makefile.in
new file mode 100644
index 00000000000..e6e04a28807
--- /dev/null
+++ b/dlls/faultrep/Makefile.in
@@ -0,0 +1,12 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = faultrep.dll
+IMPORTS   = kernel32
+
+C_SRCS = faultrep.c
+
+@MAKE_DLL_RULES@
+
+@DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/faultrep/faultrep.c b/dlls/faultrep/faultrep.c
new file mode 100644
index 00000000000..7771191696a
--- /dev/null
+++ b/dlls/faultrep/faultrep.c
@@ -0,0 +1,44 @@
+/* Fault report handling
+ *
+ * Copyright 2007 Peter Dons Tychsen
+ *
+ * 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 "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(faultrep);
+
+/***********************************************************************
+ * DllMain.
+ */
+BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
+{
+    switch(reason)
+    {
+    case DLL_WINE_PREATTACH:
+        return FALSE;
+    case DLL_PROCESS_ATTACH:
+        DisableThreadLibraryCalls(inst);
+        break;
+    case DLL_PROCESS_DETACH:
+        break;
+    }
+    return TRUE;
+}
diff --git a/dlls/faultrep/faultrep.spec b/dlls/faultrep/faultrep.spec
new file mode 100644
index 00000000000..3cc9934cc07
--- /dev/null
+++ b/dlls/faultrep/faultrep.spec
@@ -0,0 +1,14 @@
+@ stub AddERExcludedApplicationA
+@ stub AddERExcludedApplicationW
+@ stub CreateMinidumpA
+@ stub CreateMinidumpW
+@ stub ReportEREvent
+@ stub ReportEREventDW
+@ stub ReportFault
+@ stub ReportFaultDWM
+@ stub ReportFaultFromQueue
+@ stub ReportFaultToQueue
+@ stub ReportHang
+@ stub ReportKernelFaultA
+@ stub ReportKernelFaultDWW
+@ stub ReportKernelFaultW