--- /etc/X11/xinit/fixkeyboard.orig	2014-12-30 08:12:57.827803039 +0300
+++ /etc/X11/xinit/fixkeyboard	2014-12-30 07:09:33.391914615 +0300
@@ -9,8 +9,13 @@
 sysxkbmap=/etc/X11/xinit/Xkbmap
 
 if xdpyinfo |fgrep -qs XKEYBOARD; then
-	[ -s "$sysxkbmap" ] && setxkbmap `cat "$sysxkbmap"`
-	[ -s "$userxkbmap" ] && setxkbmap `cat "$userxkbmap"`
+	if [ -s "$sysxkbmap" ]; then
+		setxkbmap `cat "$sysxkbmap"` -print | xkbcomp - $DISPLAY
+	elif [ -s "$userxkbmap" ]; then
+		setxkbmap `cat "$userxkbmap"` -print | xkbcomp - $DISPLAY
+	else
+		setxkbmap -print | xkbcomp - $DISPLAY
+	fi
 fi
 
 [ -s $sysmodmap ] && xmodmap "$sysmodmap"