diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 1755f03..e70f786 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Feb 15 10:17:56 UTC 2011 - mhopf@novell.com
+
+- Disable Use-external-tool-for-creating-backtraces-on-crashes.patch:
+  - Security isn't exactly fond of the patch (bnc#666578)
+  - Patch potentially livelocks server in fork() (bnc#660166)
+
 -------------------------------------------------------------------
 Fri Feb 11 16:41:02 UTC 2011 - mhopf@novell.com
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index c9f626c..e65e726 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -248,7 +248,8 @@ popd
 %patch213 -p1
 %patch217 -p1
 %patch218 -p1
-%patch220 -p1
+# Disable backtrace generation patch for now
+#%patch220 -p1
 %patch221 -p1
 %patch222 -p1
 %patch223 -p1