diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index c7449042..4a278baa 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -330,6 +330,7 @@ patch_enable_all ()
 	enable_user32_Dialog_Paint_Event="$1"
 	enable_user32_DrawTextExW="$1"
 	enable_user32_EnumDisplayMonitors="$1"
+	enable_user32_FlashWindowEx="$1"
 	enable_user32_GetSystemMetrics="$1"
 	enable_user32_Invalidate_Key_State="$1"
 	enable_user32_ListBox_Size="$1"
@@ -1168,6 +1169,9 @@ patch_enable ()
 		user32-EnumDisplayMonitors)
 			enable_user32_EnumDisplayMonitors="$2"
 			;;
+		user32-FlashWindowEx)
+			enable_user32_FlashWindowEx="$2"
+			;;
 		user32-GetSystemMetrics)
 			enable_user32_GetSystemMetrics="$2"
 			;;
@@ -6778,6 +6782,18 @@ if test "$enable_user32_EnumDisplayMonitors" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset user32-FlashWindowEx
+# |
+# | Modified files:
+# |   *	dlls/user32/win.c
+# |
+if test "$enable_user32_FlashWindowEx" -eq 1; then
+	patch_apply user32-FlashWindowEx/0001-user32-Avoid-dereferencing-NULL-pointer-in-a-trace.patch
+	(
+		echo '+    { "Dmitry Timoshkov", "user32: Avoid dereferencing NULL pointer in a trace.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset user32-GetSystemMetrics
 # |
 # | This patchset fixes the following Wine bugs:
diff --git a/patches/user32-FlashWindowEx/0001-user32-Avoid-dereferencing-NULL-pointer-in-a-trace.patch b/patches/user32-FlashWindowEx/0001-user32-Avoid-dereferencing-NULL-pointer-in-a-trace.patch
new file mode 100644
index 00000000..90e43d49
--- /dev/null
+++ b/patches/user32-FlashWindowEx/0001-user32-Avoid-dereferencing-NULL-pointer-in-a-trace.patch
@@ -0,0 +1,34 @@
+From 57462a28a49782e3ef8b0efefab99d336b7d67a2 Mon Sep 17 00:00:00 2001
+From: Dmitry Timoshkov <dmitry@baikal.ru>
+Date: Thu, 31 Mar 2016 10:09:03 +0800
+Subject: user32: Avoid dereferencing NULL pointer in a trace.
+
+---
+ dlls/user32/win.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/user32/win.c b/dlls/user32/win.c
+index 33aedbd..43ab5ed 100644
+--- a/dlls/user32/win.c
++++ b/dlls/user32/win.c
+@@ -3472,7 +3472,7 @@ BOOL WINAPI FlashWindowEx( PFLASHWINFO pfinfo )
+ {
+     WND *wndPtr;
+ 
+-    TRACE( "%p\n", pfinfo->hwnd );
++    TRACE( "%p\n", pfinfo );
+ 
+     if (!pfinfo)
+     {
+@@ -3485,7 +3485,7 @@ BOOL WINAPI FlashWindowEx( PFLASHWINFO pfinfo )
+         SetLastError( ERROR_INVALID_PARAMETER );
+         return FALSE;
+     }
+-    FIXME( "%p - semi-stub\n", pfinfo );
++    FIXME( "%p - semi-stub\n", pfinfo->hwnd );
+ 
+     if (IsIconic( pfinfo->hwnd ))
+     {
+-- 
+2.7.1
+