diff --git a/debian/changelog b/debian/changelog
index 64635fa0..857beca2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ wine-compholio (1.7.32) UNRELEASED; urgency=low
   * Added patch to fix issues with write watches when using Exagear.
   * Added patch to avoid failure because of missing ptrace support for Exagear.
   * Added patch to automatically detect if tests are running under Wine.
+  * Added patch to avoid sending unexpected wakeup with uninitialized cookie value.
   * Removed patch to close server fd is there is no space in thread inflight fd list (accepted upstream).
   * Removed patch to fix bugs in StrStr functions (accepted upstream).
   * Removed patches to avoid sending messages in FindWindowExW (accepted upstream).
diff --git a/patches/Makefile b/patches/Makefile
index 3686bcee..683d36b9 100644
--- a/patches/Makefile
+++ b/patches/Makefile
@@ -86,6 +86,7 @@ PATCHLIST := \
 	server-Misc_ACL.ok \
 	server-OpenProcess.ok \
 	server-Stored_ACLs.ok \
+	server-Unexpected_Wakeup.ok \
 	setupapi-SetupPromptForDisk.ok \
 	shdocvw-ParseURLFromOutsideSource_Tests.ok \
 	shell32-Default_Folder_ACLs.ok \
@@ -1324,6 +1325,18 @@ server-Stored_ACLs.ok: ntdll-DOS_Attributes.ok
 		echo '+    { "Erich E. Hoover", "server: Convert return of file security masks with generic access mappings.", 7 },'; \
 	) > server-Stored_ACLs.ok
 
+# Patchset server-Unexpected_Wakeup
+# |
+# | Modified files:
+# |   *	server/thread.c
+# |
+.INTERMEDIATE: server-Unexpected_Wakeup.ok
+server-Unexpected_Wakeup.ok:
+	$(call APPLY_FILE,server-Unexpected_Wakeup/0001-server-Avoid-sending-unexpected-wakeup-with-uninitia.patch)
+	@( \
+		echo '+    { "Sebastian Lackner", "server: Avoid sending unexpected wakeup with uninitialized cookie value.", 1 },'; \
+	) > server-Unexpected_Wakeup.ok
+
 # Patchset setupapi-SetupPromptForDisk
 # |
 # | This patchset fixes the following Wine bugs:
diff --git a/patches/server-Unexpected_Wakeup/0001-server-Avoid-sending-unexpected-wakeup-with-uninitia.patch b/patches/server-Unexpected_Wakeup/0001-server-Avoid-sending-unexpected-wakeup-with-uninitia.patch
new file mode 100644
index 00000000..3caac1a2
--- /dev/null
+++ b/patches/server-Unexpected_Wakeup/0001-server-Avoid-sending-unexpected-wakeup-with-uninitia.patch
@@ -0,0 +1,67 @@
+From 9df06c6e4b4cf258b7f321dfd5e20467bef2b36f Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sat, 22 Nov 2014 17:42:22 +0100
+Subject: server: Avoid sending unexpected wakeup with uninitialized cookie
+ value.
+
+While executing the kernel32/sync tests I noticed a couple of unexpected wakeup cookies, which looked like uninitialized wineserver memory.
+Here an excerpt from the log (added additional debug values):
+---
+ server/thread.c | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/server/thread.c b/server/thread.c
+index ba3f1d5..bdd9ef7 100644
+--- a/server/thread.c
++++ b/server/thread.c
+@@ -601,6 +601,7 @@ static int wait_on( const select_op_t *select_op, unsigned int count, struct obj
+     wait->count   = count;
+     wait->flags   = flags;
+     wait->select  = select_op->op;
++    wait->cookie  = 0;
+     wait->user    = NULL;
+     wait->timeout = timeout;
+     wait->abandoned = 0;
+@@ -719,7 +720,7 @@ int wake_thread( struct thread *thread )
+         cookie = thread->wait->cookie;
+         if (debug_level) fprintf( stderr, "%04x: *wakeup* signaled=%d\n", thread->id, signaled );
+         end_wait( thread );
+-        if (send_thread_wakeup( thread, cookie, signaled ) == -1) /* error */
++        if (cookie && send_thread_wakeup( thread, cookie, signaled ) == -1) /* error */
+         {
+             if (!count) count = -1;
+             break;
+@@ -749,7 +750,7 @@ int wake_thread_queue_entry( struct wait_queue_entry *entry )
+     if (debug_level) fprintf( stderr, "%04x: *wakeup* signaled=%d\n", thread->id, signaled );
+     end_wait( thread );
+ 
+-    if (send_thread_wakeup( thread, cookie, signaled ) != -1)
++    if (!cookie || send_thread_wakeup( thread, cookie, signaled ) != -1)
+         wake_thread( thread );  /* check other waits too */
+ 
+     return 1;
+@@ -768,6 +769,8 @@ static void thread_timeout( void *ptr )
+ 
+     if (debug_level) fprintf( stderr, "%04x: *wakeup* signaled=TIMEOUT\n", thread->id );
+     end_wait( thread );
++
++    assert( cookie );
+     if (send_thread_wakeup( thread, cookie, STATUS_TIMEOUT ) == -1) return;
+     /* check if other objects have become signaled in the meantime */
+     wake_thread( thread );
+@@ -1429,6 +1432,12 @@ DECL_HANDLER(select)
+         set_error( STATUS_INVALID_PARAMETER );
+         return;
+     }
++    if (!req->cookie)
++    {
++        set_error( STATUS_INVALID_PARAMETER );
++        return;
++    }
++
+     op_size = min( get_req_data_size() - sizeof(*result), sizeof(select_op) );
+     memset( &select_op, 0, sizeof(select_op) );
+     memcpy( &select_op, result + 1, op_size );
+-- 
+2.1.3
+