diff --git a/README.md b/README.md
index 59568e3e..8d232ca7 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 ===================================
 
-**Bugfixes and features included in the next upcoming release [15]:**
+**Bugfixes and features included in the next upcoming release [16]:**
 
 * Add stub for gdiplus.GdipCreateEffect ([Wine Bug #32163](https://bugs.winehq.org/show_bug.cgi?id=32163))
 * Add support for CopyFileEx progress callback ([Wine Bug #22692](https://bugs.winehq.org/show_bug.cgi?id=22692))
@@ -52,6 +52,7 @@ Included bug fixes and improvements
 * Fix crash in clip_cursor_notify caused by uninitialized TLS
 * Fix race-condition when threads are killed during shutdown
 * Implement SetFileInformationByHandle
+* Increase wineconsole commandline buffer size ([Wine Bug #34814](https://bugs.winehq.org/show_bug.cgi?id=34814))
 * Process Hacker 2.x needs ntoskrnl.ProbeForRead ([Wine Bug #38103](https://bugs.winehq.org/show_bug.cgi?id=38103))
 * Properly track handle count of wineserver objects
 * Support for shell32 file operation progress dialog
diff --git a/debian/changelog b/debian/changelog
index 7186f43d..b94119da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,7 @@ wine-staging (1.7.38) UNRELEASED; urgency=low
   * Added patch to correct DDSCAPS2 and DDSURFACEDESC2 structure (by Amine Khaldi, wine-patched/pull/7).
   * Added patch to fix crash when trying to switch back to a 16-bit stack.
   * Added patches to improve performance by reusing old async IO structure if possible.
+  * Added patch to increase wineconsole commandline buffer size.
   * Removed patch to properly call DriverUnload when unloading device drivers (accepted upstream).
   * Removed patch to allow Accept-Encoding for HTTP/1.0 in wininet (accepted upstream).
   * Removed patch to declare pDirectInputCreateEx in a MSVC compatible way (accepted upstream).
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index df657eb9..e0a86f82 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -198,6 +198,7 @@ patch_enable_all ()
 	enable_wineboot_HKEY_DYN_DATA="$1"
 	enable_winebuild_LinkerVersion="$1"
 	enable_winecfg_Staging="$1"
+	enable_wineconsole_Buffer_Size="$1"
 	enable_wined3d_CSMT_Helper="$1"
 	enable_wined3d_CSMT_Main="$1"
 	enable_wined3d_DXTn="$1"
@@ -634,6 +635,9 @@ patch_enable ()
 		winecfg-Staging)
 			enable_winecfg_Staging="$2"
 			;;
+		wineconsole-Buffer_Size)
+			enable_wineconsole_Buffer_Size="$2"
+			;;
 		wined3d-CSMT_Helper)
 			enable_wined3d_CSMT_Helper="$2"
 			;;
@@ -3973,6 +3977,21 @@ if test "$enable_winebuild_LinkerVersion" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset wineconsole-Buffer_Size
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#34814] Increase wineconsole commandline buffer size
+# |
+# | Modified files:
+# |   *	programs/wineconsole/wineconsole.c
+# |
+if test "$enable_wineconsole_Buffer_Size" -eq 1; then
+	patch_apply wineconsole-Buffer_Size/0001-wineconsole-Increase-buffer-to-allow-larger-commandl.patch
+	(
+		echo '+    { "Sebastian Lackner", "wineconsole: Increase buffer to allow larger commandline strings.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset winedevice-Fix_Relocation
 # |
 # | This patchset fixes the following Wine bugs:
diff --git a/patches/wineconsole-Buffer_Size/0001-wineconsole-Increase-buffer-to-allow-larger-commandl.patch b/patches/wineconsole-Buffer_Size/0001-wineconsole-Increase-buffer-to-allow-larger-commandl.patch
new file mode 100644
index 00000000..27f637e7
--- /dev/null
+++ b/patches/wineconsole-Buffer_Size/0001-wineconsole-Increase-buffer-to-allow-larger-commandl.patch
@@ -0,0 +1,25 @@
+From a98938b7cea50114a55f24e608581dc27eac9cab Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Wed, 4 Mar 2015 21:16:58 +0100
+Subject: wineconsole: Increase buffer to allow larger commandline strings.
+
+---
+ programs/wineconsole/wineconsole.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c
+index 3c2faf5..038b360 100644
+--- a/programs/wineconsole/wineconsole.c
++++ b/programs/wineconsole/wineconsole.c
+@@ -830,7 +830,7 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, INT nCmdSh
+         break;
+     case from_process_name:
+         {
+-            WCHAR           buffer[256];
++            static WCHAR buffer[4096];
+ 
+             MultiByteToWideChar(CP_ACP, 0, wci.ptr, -1, buffer, sizeof(buffer) / sizeof(buffer[0]));
+ 
+-- 
+2.3.0
+
diff --git a/patches/wineconsole-Buffer_Size/definition b/patches/wineconsole-Buffer_Size/definition
new file mode 100644
index 00000000..7507537e
--- /dev/null
+++ b/patches/wineconsole-Buffer_Size/definition
@@ -0,0 +1 @@
+Fixes: [34814] Increase wineconsole commandline buffer size