diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes
index 9058daf..663fbe4 100644
--- a/xkeyboard-config.changes
+++ b/xkeyboard-config.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Apr  4 15:24:39 CEST 2008 - sndirsch@suse.de
+
+- keyboard layout switching is now also possible as root (bnc #335553)
+
 -------------------------------------------------------------------
 Mon Mar 10 18:31:26 CET 2008 - sndirsch@suse.de
 
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index ca18646..ab0b63e 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -21,7 +21,7 @@ Provides:       xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us
 PreReq:         /bin/ln /bin/rm
 AutoReqProv:    on
 Version:        1.2
-Release:        18
+Release:        27
 Summary:        The X Keyboard Extension
 Source:         %name-%version.tar.bz2
 Patch4:         xkeyboard-config.mainline-cvs.mac-es.patch
@@ -80,6 +80,9 @@ make
 make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/var/lib/xkb
 ln -snf /usr/bin/xkbcomp $RPM_BUILD_ROOT/usr/share/X11/xkb/xkbcomp
+# Bug 335553
+mkdir -p $RPM_BUILD_ROOT/var/lib/xkb/compiled/
+ln -snf /var/lib/xkb/compiled/ $RPM_BUILD_ROOT/usr/share/X11/xkb/compiled
 %find_lang %name
 
 %clean
@@ -89,9 +92,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc AUTHORS COPYING README docs/HOWTO.* docs/README.*
 %dir /var/lib/xkb
+%dir /var/lib/xkb/compiled
 /usr/share/X11/xkb/
 
 %changelog
+* Fri Apr 04 2008 sndirsch@suse.de
+- keyboard layout switching is now also possible as root (bnc #335553)
 * Mon Mar 10 2008 sndirsch@suse.de
 - fixed keycodes of MS nek4k (bnc #366515)
 * Mon Mar 10 2008 sndirsch@suse.de
@@ -222,7 +228,7 @@ rm -rf $RPM_BUILD_ROOT
 - added missing xorg rules symlinks (Bug #150245)
 * Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Sun Jan 22 2006 sndirsch@suse.de
+* Mon Jan 23 2006 sndirsch@suse.de
 - numlock-scrollLock.diff:
   * fix for Numlock/ScrollLock problem (X.Org Bug #5635)
 * Mon Jan 16 2006 sndirsch@suse.de
@@ -311,7 +317,7 @@ rm -rf $RPM_BUILD_ROOT
   Some translations are updated (though the overall translation
   activity is disappointinly low).
   * obsoletes p_xkb-cherryblueb.diff
-* Sun Oct 24 2004 sndirsch@suse.de
+* Mon Oct 25 2004 sndirsch@suse.de
 - updated patches
 - removed obsolete patches
 * Sun Oct 03 2004 sndirsch@suse.de