diff --git a/README.md b/README.md
index 83f307cd..409c44e3 100644
--- a/README.md
+++ b/README.md
@@ -34,6 +34,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]:**
+
+* Remove dead code from SCROLL_TrackScrollBar ([Wine Bug #39558](https://bugs.winehq.org/show_bug.cgi?id=39558))
+
+
 **Bug fixes and features in Wine Staging 1.9.0 [269]:**
 
 *Note: The following list only contains features and bug fixes which are not
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 6389ce20..b5c5924b 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -278,6 +278,7 @@ patch_enable_all ()
 	enable_shlwapi_AssocGetPerceivedType="$1"
 	enable_shlwapi_SHMapHandle="$1"
 	enable_shlwapi_UrlCombine="$1"
+	enable_user32_Dead_Code="$1"
 	enable_user32_DeferWindowPos="$1"
 	enable_user32_Dialog_Paint_Event="$1"
 	enable_user32_DrawTextExW="$1"
@@ -947,6 +948,9 @@ patch_enable ()
 		shlwapi-UrlCombine)
 			enable_shlwapi_UrlCombine="$2"
 			;;
+		user32-Dead_Code)
+			enable_user32_Dead_Code="$2"
+			;;
 		user32-DeferWindowPos)
 			enable_user32_DeferWindowPos="$2"
 			;;
@@ -5505,6 +5509,21 @@ if test "$enable_shlwapi_UrlCombine" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset user32-Dead_Code
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#39558] Remove dead code from SCROLL_TrackScrollBar
+# |
+# | Modified files:
+# |   *	dlls/user32/scroll.c
+# |
+if test "$enable_user32_Dead_Code" -eq 1; then
+	patch_apply user32-Dead_Code/0001-user32-Remove-dead-code-from-SCROLL_TrackScrollBar.patch
+	(
+		echo '+    { "Jarkko Korpi", "user32: Remove dead code from SCROLL_TrackScrollBar.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset user32-DeferWindowPos
 # |
 # | This patchset fixes the following Wine bugs:
diff --git a/patches/user32-Dead_Code/0001-user32-Remove-dead-code-from-SCROLL_TrackScrollBar.patch b/patches/user32-Dead_Code/0001-user32-Remove-dead-code-from-SCROLL_TrackScrollBar.patch
new file mode 100644
index 00000000..67906fc0
--- /dev/null
+++ b/patches/user32-Dead_Code/0001-user32-Remove-dead-code-from-SCROLL_TrackScrollBar.patch
@@ -0,0 +1,35 @@
+From 7fa97568c8aadc5b2d27dace09946efe403f0367 Mon Sep 17 00:00:00 2001
+From: Jarkko Korpi <jarkko_korpi@hotmail.com>
+Date: Mon, 14 Dec 2015 10:49:25 +0200
+Subject: user32: Remove dead code from SCROLL_TrackScrollBar.
+
+---
+ dlls/user32/scroll.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c
+index be205ef..b28ee44 100644
+--- a/dlls/user32/scroll.c
++++ b/dlls/user32/scroll.c
+@@ -1096,7 +1096,6 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt)
+ void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt )
+ {
+     MSG msg;
+-    INT xoffset = 0, yoffset = 0;
+ 
+     if (scrollbar != SB_CTL)
+     {
+@@ -1117,8 +1116,8 @@ void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt )
+             msg.message == WM_MOUSEMOVE ||
+             (msg.message == WM_SYSTIMER && msg.wParam == SCROLL_TIMER))
+         {
+-            pt.x = (short)LOWORD(msg.lParam) + xoffset;
+-            pt.y = (short)HIWORD(msg.lParam) + yoffset;
++            pt.x = (short)LOWORD(msg.lParam);
++            pt.y = (short)HIWORD(msg.lParam);
+             SCROLL_HandleScrollEvent( hwnd, scrollbar, msg.message, pt );
+         }
+         else
+-- 
+2.6.4
+
diff --git a/patches/user32-Dead_Code/definition b/patches/user32-Dead_Code/definition
new file mode 100644
index 00000000..e971bbed
--- /dev/null
+++ b/patches/user32-Dead_Code/definition
@@ -0,0 +1 @@
+Fixes: [39558] Remove dead code from SCROLL_TrackScrollBar
diff --git a/staging/changelog b/staging/changelog
index 1e8bd65a..48fe8b1c 100644
--- a/staging/changelog
+++ b/staging/changelog
@@ -2,6 +2,7 @@ wine-staging (1.9.1) UNRELEASED; urgency=low
   * Removed patch to implement SystemHandleInformation (accepted upstream).
   * Removed patch to align terminating null WCHAR in SysAllocStringByteLen
     (accepted upstream).
+  * Added patch to remove dead code from SCROLL_TrackScrollBar.
  -- Sebastian Lackner <sebastian@fds-team.de>  Wed, 30 Dec 2015 01:03:12 +0100
 
 wine-staging (1.9.0) unstable; urgency=low