diff --git a/Mesa.changes b/Mesa.changes
index af87bae..34f9649 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 17 12:34:12 UTC 2016 - mstaudt@suse.com
+
+- Mesa.spec: Disable Nouveau locking patches by default
+
 -------------------------------------------------------------------
 Fri Oct 14 10:17:17 UTC 2016 - mstaudt@suse.com
 
diff --git a/Mesa.spec b/Mesa.spec
index ea82d2b..13baeb9 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -16,6 +16,10 @@
 #
 
 
+# Only enable the Nouveau locking patches if you know what you're doing.
+# They may fix KDE on Nouveau. They may also deadlock your userland.
+%define use_broken_nouveau_locking_patches 0
+
 %define glamor 1
 %define _name_archive mesa
 %define _version 12.0.3
@@ -73,12 +77,15 @@ Patch18:        n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch
 Patch21:        n_Define-GLAPIVAR-separate-from-GLAPI.patch
 # Already upstream
 Patch22:        U_r300g-Set-R300_VAP_CNTL-on-RSxxx-to-avoid-triangle-flickering.patch
+
 # Nouveau multithreading workarounds from https://github.com/imirkin/mesa/commits/locking
+%if %{use_broken_nouveau_locking_patches}
 Patch61:        N_01-WIP-nouveau-add-locking.patch
 Patch62:        N_02-nouveau-more-locking-make-sure-that-fence-work-is-always-done-with-the-push-mutex-acquired.patch
 Patch63:        N_03-nv30-locking-fixes.patch
 Patch64:        N_04-nv50-Fix-double-lock-in-nv50_hw_sm_get_query_result.patch
 Patch65:        N_05-Use-nv50_render_condition-in-nv50_blitctx_post_blit.patch
+%endif
 
 BuildRequires:  autoconf >= 2.60
 BuildRequires:  automake
@@ -592,11 +599,14 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 %patch18 -p1
 %patch21 -p1
 %patch22 -p1
+
+%if %{use_broken_nouveau_locking_patches}
 %patch61 -p1
 %patch62 -p1
 %patch63 -p1
 %patch64 -p1
 %patch65 -p1
+%endif
 
 %build
 %if 0%{?suse_version} >= 1310