diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes
index 3bb18e5..ea8e6c5 100644
--- a/xkeyboard-config.changes
+++ b/xkeyboard-config.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Dec  4 21:14:23 CET 2009 - sndirsch@suse.de
+
+- remove line accidentally left in during patch adaption to fix
+  macbook again (Ruediger Oertel)
+
 -------------------------------------------------------------------
 Tue Nov 17 11:04:20 CET 2009 - sndirsch@suse.de
 
diff --git a/xkeyboard-config.macintosh.patch b/xkeyboard-config.macintosh.patch
index 9424d7b..7ae4f00 100644
--- a/xkeyboard-config.macintosh.patch
+++ b/xkeyboard-config.macintosh.patch
@@ -3,18 +3,20 @@ handle the left contrl/option/apple keys properly.
 apple+tab switches window
 alt+e gives euro, alt+l gives @, etc
 
---- rules/base.ml_s.part.orig	2009-09-21 23:23:32.000000000 +0200
-+++ rules/base.ml_s.part	2009-11-17 11:17:55.000000000 +0100
-@@ -21,6 +21,7 @@
+================================================================================
+--- rules/base.ml_s.part
++++ rules/base.ml_s.part
+@@ -20,7 +20,7 @@
+   macintosh_old	$nonlatin		=	macintosh_vndr/us(oldmac)+%l%(v):2
    macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l%(v)
   $macs		en_US			=	pc+macintosh_vndr/us(extended)
-  $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l%(v)
+- $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l%(v)
 + $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l%(v)+altwin(swap_lalt_lwin)+level3(alt_switch)
    olpc		$olpclayouts		=	olpc+%l%(m)
    olpc		*			=	olpc+%l%(v)
   $thinkpads   	br			=	pc+br(thinkpad)
---- rules/base.ml1_s.part.orig	2009-06-09 12:10:01.000000000 +0200
-+++ rules/base.ml1_s.part	2009-11-17 11:18:25.000000000 +0100
+--- rules/base.ml1_s.part
++++ rules/base.ml1_s.part
 @@ -5,6 +5,6 @@
    macintosh_old	us			=	macintosh_vndr/us(oldmac)
    macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index 60178e5..e5f7cf2 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -21,14 +21,14 @@
 Name:           xkeyboard-config
 BuildRequires:  intltool perl-XML-Parser xorg-x11
 Url:            http://www.freedesktop.org/Software/XKeyboardConfig
-License:        GPL v2 or later ; LGPL v2.1 or later ; MIT License (or similar)
+License:        GPLv2+ ; LGPLv2.1+ ; MIT License (or similar)
 Group:          System/X11/Utilities
 Requires:       xorg-x11
 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:        1
+Release:        2
 Summary:        The X Keyboard Extension
 Source:         %name-%version.tar.bz2
 Patch4:         xkeyboard-config.mainline-cvs.mac-es.patch