diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes
index 19675f9..ae08dac 100644
--- a/xkeyboard-config.changes
+++ b/xkeyboard-config.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Aug 27 12:23:35 UTC 2013 - sndirsch@suse.com
+
+- remove server-*.xkm in %post to show correct layout after
+  package upgrade. (bnc#662014, bnc#831823)
+
 -------------------------------------------------------------------
 Wed May 29 22:26:15 UTC 2013 - tobias.johannes.klausmann@mni.thm.de
 
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index 6dd6fdc..1555315 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -80,6 +80,9 @@ ln -snf /var/lib/xkb/compiled/ $RPM_BUILD_ROOT/usr/share/X11/xkb/compiled
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+rm -rf /var/lib/xkb/compiled/server*.xkm
+
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING README docs/HOWTO.* docs/README.*