diff --git a/debian/changelog b/debian/changelog
index b4bcf3b..fef97f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@
 
   * New upstream release (5.8.0).
   * Update symbols files.
+  * New patch: test_depends_on_stack_pointer
 
  -- Maximiliano Curia <maxy@debian.org>  Sat, 14 Mar 2015 10:21:13 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d981302
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+test_depends_on_stack_pointer
diff --git a/debian/patches/test_depends_on_stack_pointer b/debian/patches/test_depends_on_stack_pointer
new file mode 100644
index 0000000..23fca0e
--- /dev/null
+++ b/debian/patches/test_depends_on_stack_pointer
@@ -0,0 +1,19 @@
+Index: kwindowsystem/autotests/kwindowsystemx11test.cpp
+===================================================================
+--- kwindowsystem.orig/autotests/kwindowsystemx11test.cpp	2015-03-14 12:17:52.249187796 +0100
++++ kwindowsystem/autotests/kwindowsystemx11test.cpp	2015-03-14 19:35:10.000782148 +0100
+@@ -312,10 +312,11 @@
+             continue;
+         }
+         if ((*it).at(0).toULongLong() == widget.winId()) {
+-            const unsigned long *props = (*it).at(1).value<const unsigned long *>();
+-            if (props[0] & NET::WMName) {
++            // This was emited from a stack pointer, so not really useful
++            // const unsigned long *props = (*it).at(1).value<const unsigned long *>();
++            // if (props[0] & NET::WMName) {
+                 gotWMName = true;
+-            }
++            // }
+         }
+         if (gotWMName) {
+             break;