diff --git a/README.md b/README.md
index 1aa794ae..60fd0426 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,11 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 -----------------------------------
 
+**Bug fixes and features included in the next upcoming release [1]:**
+
+* Silence repeated wbemprox "timeout not supported" fixme ([Wine Bug #37618](https://bugs.winehq.org/show_bug.cgi?id=37618))
+
+
 **Bug fixes and features in Wine Staging 1.7.46 [236]:**
 
 *Note: The following list only contains features and bug fixes which are not
diff --git a/debian/changelog b/debian/changelog
index 1cb1dbb4..7f89c32c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 wine-staging (1.7.47) UNRELEASED; urgency=low
   * Added patch to silence repeated winhttp "no support on this platform"
     message.
+  * Added patch to silence repeated wbemprox "timeout not supported" fixme.
   * Removed patch to implement kernel32.GetNumaProcessorNode (accepted
     upstream).
   * Removed patch to initialize *end with NULL on failure in msvcrt.strtod
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 5f3eb668..4dd8c19e 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -237,6 +237,7 @@ patch_enable_all ()
 	enable_vcomp_Stub_Functions="$1"
 	enable_version_VerQueryValue="$1"
 	enable_wbemdisp_ISWbemSecurity="$1"
+	enable_wbemdisp_Timeout="$1"
 	enable_wiaservc_IEnumWIA_DEV_INFO="$1"
 	enable_windowscodecs_GIF_Decoder="$1"
 	enable_windowscodecs_TIFF_Decoder="$1"
@@ -784,6 +785,9 @@ patch_enable ()
 		wbemdisp-ISWbemSecurity)
 			enable_wbemdisp_ISWbemSecurity="$2"
 			;;
+		wbemdisp-Timeout)
+			enable_wbemdisp_Timeout="$2"
+			;;
 		wiaservc-IEnumWIA_DEV_INFO)
 			enable_wiaservc_IEnumWIA_DEV_INFO="$2"
 			;;
@@ -4660,6 +4664,21 @@ if test "$enable_wbemdisp_ISWbemSecurity" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset wbemdisp-Timeout
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#37618] Silence repeated wbemprox "timeout not supported" fixme
+# |
+# | Modified files:
+# |   *	dlls/wbemprox/class.c
+# |
+if test "$enable_wbemdisp_Timeout" -eq 1; then
+	patch_apply wbemdisp-Timeout/0001-wbemprox-Silence-repeated-timeout-not-supported-fixm.patch
+	(
+		echo '+    { "Jarkko Korpi", "wbemprox: Silence repeated \"timeout not supported\" fixme.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset wiaservc-IEnumWIA_DEV_INFO
 # |
 # | This patchset fixes the following Wine bugs:
diff --git a/patches/wbemdisp-Timeout/0001-wbemprox-Silence-repeated-timeout-not-supported-fixm.patch b/patches/wbemdisp-Timeout/0001-wbemprox-Silence-repeated-timeout-not-supported-fixm.patch
new file mode 100644
index 00000000..60f6271c
--- /dev/null
+++ b/patches/wbemdisp-Timeout/0001-wbemprox-Silence-repeated-timeout-not-supported-fixm.patch
@@ -0,0 +1,29 @@
+From de11056b08110b83c3ce9e2f90c16280d6c74193 Mon Sep 17 00:00:00 2001
+From: Jarkko Korpi <jarkko_korpi@hotmail.com>
+Date: Mon, 6 Jul 2015 23:47:07 +0300
+Subject: wbemprox: Silence repeated "timeout not supported" fixme.
+
+---
+ dlls/wbemprox/class.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c
+index afb9f8c..5ce0381 100644
+--- a/dlls/wbemprox/class.c
++++ b/dlls/wbemprox/class.c
+@@ -120,7 +120,11 @@ static HRESULT WINAPI enum_class_object_Next(
+ 
+     if (!uCount) return WBEM_S_FALSE;
+     if (!apObjects || !puReturned) return WBEM_E_INVALID_PARAMETER;
+-    if (lTimeout != WBEM_INFINITE) FIXME("timeout not supported\n");
++    if (lTimeout != WBEM_INFINITE)
++    {
++        static int once;
++        if (!once++) FIXME("timeout not supported\n");
++    }
+ 
+     *puReturned = 0;
+     if (ec->index >= view->count) return WBEM_S_FALSE;
+-- 
+2.4.5
+
diff --git a/patches/wbemdisp-Timeout/definition b/patches/wbemdisp-Timeout/definition
new file mode 100644
index 00000000..a4e55f7d
--- /dev/null
+++ b/patches/wbemdisp-Timeout/definition
@@ -0,0 +1 @@
+Fixes: [37618] Silence repeated wbemprox "timeout not supported" fixme