diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes
index 9e40df5..ace772b 100644
--- a/xkeyboard-config.changes
+++ b/xkeyboard-config.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Jun 19 14:19:48 CEST 2010 - sndirsch@suse.de
+
+- xkeyboard-config.ctrl_alt_bksp.patch
+  * enable zapping by default (still protected by ZapWarning) 
+    (bnc #576481)
+
 -------------------------------------------------------------------
 Sun May 16 00:29:57 CEST 2010 - sndirsch@suse.de
 
diff --git a/xkeyboard-config.ctrl_alt_bksp.patch b/xkeyboard-config.ctrl_alt_bksp.patch
new file mode 100644
index 0000000..b0a8a1e
--- /dev/null
+++ b/xkeyboard-config.ctrl_alt_bksp.patch
@@ -0,0 +1,9 @@
+Index: xkeyboard-config-1.7/rules/evdev.m_s.part
+===================================================================
+--- xkeyboard-config-1.7.orig/rules/evdev.m_s.part
++++ xkeyboard-config-1.7/rules/evdev.m_s.part
+@@ -1,2 +1,2 @@
+-  $evdevkbds    =   +inet(evdev)+inet(%m)
+-  *             =   +inet(evdev)
++  $evdevkbds    =   +inet(evdev)+inet(%m)+terminate(ctrl_alt_bksp)
++  *             =   +inet(evdev)+terminate(ctrl_alt_bksp)
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index 5c6074d..b1b9d17 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -28,7 +28,7 @@ Provides:       xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us
 PreReq:         /bin/ln /bin/rm
 AutoReqProv:    on
 Version:        1.7
-Release:        4
+Release:        5
 Summary:        The X Keyboard Extension
 Source:         %name-%version.tar.bz2
 Patch4:         xkeyboard-config.mainline-cvs.mac-es.patch
@@ -44,6 +44,7 @@ Patch110:       MDSW-change-keycode.diff
 Patch115:       xkeyboard-config.inet.microsoftpro.patch
 Patch116:       xkeyboard-config-commit-81d9313.diff
 Patch117:       xkeyboard-config-commit-dc87d0c.diff
+Patch118:       xkeyboard-config.ctrl_alt_bksp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -77,6 +78,7 @@ Authors:
 %patch115 -p0
 %patch116 -p1
 %patch117 -p1
+%patch118 -p1
 
 %build
 %configure --with-xkb-rules-symlink=xfree86,xorg \