Added xkeyboard-config-1.6.tar.gz

58 files changed, 3491 insertions, 2383 deletions

diff --git a/xorg-server/xkbdata.src/symbols/Makefile.am b/xorg-server/xkbdata.src/symbols/Makefile.am
index 371d1aa3e..d033a159c 100644
--- a/xorg-server/xkbdata.src/symbols/Makefile.am
+++ b/xorg-server/xkbdata.src/symbols/Makefile.am
@@ -6,7 +6,7 @@ ad af al \
 am ara az \
 be bd \
 bg br ba \
-bt by braille \
+bt by brai \
 ca cd \
 ch cn cz \
 de dk \
@@ -24,13 +24,14 @@ mm mn mt mv \
 ng nl no np \
 pc pk pl pt \
 ro rs ru \
-se si sk \
+se si sk sn \
 sy th \
-tj tr \
+terminate \
+tj tm tr \
 ua us uz vn \
 za \
 altwin capslock compose ctrl eurosign group inet \
-keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl
+keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl typo
 
 dir_data = $(dist_symbols_DATA)
 
diff --git a/xorg-server/xkbdata.src/symbols/Makefile.in b/xorg-server/xkbdata.src/symbols/Makefile.in
index 98c3d027e..67faac258 100644
--- a/xorg-server/xkbdata.src/symbols/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,15 +18,11 @@
 # Replaces Imake's MakeXkbDir() rule
 # svu: taken from xkbdata
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -52,10 +48,11 @@ SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -66,14 +63,14 @@ am__installdirs = "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(symbolsdir)"
 dist_dirDATA_INSTALL = $(INSTALL_DATA)
 dist_symbolsDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_dir_DATA) $(dist_symbols_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -86,10 +83,6 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -103,43 +96,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -159,15 +133,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -175,6 +149,7 @@ am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build_alias = @build_alias@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -198,8 +173,12 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 xkb_base = @xkb_base@
 xkb_rules_symlink = @xkb_rules_symlink@
 SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
@@ -209,7 +188,7 @@ ad af al \
 am ara az \
 be bd \
 bg br ba \
-bt by braille \
+bt by brai \
 ca cd \
 ch cn cz \
 de dk \
@@ -227,13 +206,14 @@ mm mn mt mv \
 ng nl no np \
 pc pk pl pt \
 ro rs ru \
-se si sk \
+se si sk sn \
 sy th \
-tj tr \
+terminate \
+tj tm tr \
 ua us uz vn \
 za \
 altwin capslock compose ctrl eurosign group inet \
-keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl
+keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl typo
 
 dir_data = $(dist_symbols_DATA)
 dist_dir_DATA = $(subdir).dir
@@ -246,8 +226,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -271,10 +251,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
 install-dist_dirDATA: $(dist_dir_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(dirdir)" || $(mkdir_p) "$(DESTDIR)$(dirdir)"
+	test -z "$(dirdir)" || $(MKDIR_P) "$(DESTDIR)$(dirdir)"
 	@list='$(dist_dir_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -291,7 +270,7 @@ uninstall-dist_dirDATA:
 	done
 install-dist_symbolsDATA: $(dist_symbols_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+	test -z "$(symbolsdir)" || $(MKDIR_P) "$(DESTDIR)$(symbolsdir)"
 	@list='$(dist_symbols_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -338,8 +317,7 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -383,8 +361,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -409,8 +387,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -420,13 +398,12 @@ ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -440,23 +417,21 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/..
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -470,7 +445,7 @@ distdir: $(DISTFILES)
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -478,6 +453,8 @@ distdir: $(DISTFILES)
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -488,7 +465,7 @@ all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(symbolsdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -535,12 +512,20 @@ info-am:
 
 install-data-am: install-dist_dirDATA install-dist_symbolsDATA
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -559,24 +544,25 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-dist_dirDATA uninstall-dist_symbolsDATA \
-	uninstall-info-am
+uninstall-am: uninstall-dist_dirDATA uninstall-dist_symbolsDATA
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-recursive ctags ctags-recursive \
-	distclean distclean-generic distclean-recursive distclean-tags \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic ctags \
+	ctags-recursive distclean distclean-generic distclean-tags \
 	distdir dvi dvi-am html html-am info info-am install \
 	install-am install-data install-data-am install-dist_dirDATA \
-	install-dist_symbolsDATA install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-dist_symbolsDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
 	uninstall uninstall-am uninstall-dist_dirDATA \
-	uninstall-dist_symbolsDATA uninstall-info-am
+	uninstall-dist_symbolsDATA
 
 
 $(subdir).dir: $(dir_data)
diff --git a/xorg-server/xkbdata.src/symbols/altwin b/xorg-server/xkbdata.src/symbols/altwin
index a3c633a0f..64e8a3577 100644
--- a/xorg-server/xkbdata.src/symbols/altwin
+++ b/xorg-server/xkbdata.src/symbols/altwin
@@ -18,6 +18,18 @@ xkb_symbols "ctrl_win" {
     modifier_map Control { <LWIN>, <RWIN> };
 };
 
+// Ctrl is mapped to the Alt-keys, Alt is mapped to the Win-keys,  Win is mapped to the Ctrl-keys.
+partial modifier_keys 
+xkb_symbols "ctrl_alt_win" {
+    key <LALT> {	[ 	Control_L, Control_L		]	};
+    key <RALT> {	[ 	Control_R, Control_R		]	};
+    key <LWIN> {	[	Alt_L, Meta_L    	]	};
+    key <RWIN> {	[	Alt_R, Meta_R		]	};
+    modifier_map Control { <RALT>, <LALT> };
+    modifier_map  Mod1 { <LWIN>, <RWIN> };
+};
+
+
 partial modifier_keys 
 xkb_symbols "meta_win" {
     key <LALT> {	[ 	Alt_L,	Alt_L		]	};
@@ -37,13 +49,6 @@ xkb_symbols "left_meta_win" {
 };
 
 partial modifier_keys 
-xkb_symbols "super_win" {
-    key <LWIN> {	[ 	Super_L			]	};
-    key <RWIN> {	[ 	Super_R			]	};
-    modifier_map Mod4	{ Super_L, Super_R };
-};
-
-partial modifier_keys 
 xkb_symbols "hyper_win" {
     key <LWIN> {	[ 	Hyper_L			]	};
     key <RWIN> {	[ 	Hyper_R			]	};
diff --git a/xorg-server/xkbdata.src/symbols/ara b/xorg-server/xkbdata.src/symbols/ara
index a42fc6981..9fa40e981 100644
--- a/xorg-server/xkbdata.src/symbols/ara
+++ b/xorg-server/xkbdata.src/symbols/ara
@@ -31,7 +31,7 @@ xkb_symbols "basic" {
     key <AD02> {  [      Arabic_sad,     Arabic_fathatan  ]     };
     key <AD03> {  [     Arabic_theh,     Arabic_damma     ]     };
     key <AD04> {  [      Arabic_qaf,     Arabic_dammatan  ]     };
-    key <AD05> {  [      Arabic_feh,       VoidSymbol     ]     };
+    key <AD05> {  [      Arabic_feh,     0x100fef9        ]     };
     key <AD06> {  [   Arabic_ghain, Arabic_hamzaunderalef ]     };
     key <AD07> {  [      Arabic_ain,         grave        ]     };
     key <AD08> {  [       Arabic_ha,        division      ]     };
@@ -44,7 +44,7 @@ xkb_symbols "basic" {
     key <AC02> {  [     Arabic_seen,   Arabic_kasratan    ]     };
     key <AC03> {  [      Arabic_yeh,       bracketright   ]     };
     key <AC04> {  [      Arabic_beh,       bracketleft    ]     };
-    key <AC05> {  [      Arabic_lam,       VoidSymbol     ]     };
+    key <AC05> {  [      Arabic_lam,       0x100fef7      ]     };
     key <AC06> {  [     Arabic_alef,   Arabic_hamzaonalef ]     };
     key <AC07> {  [      Arabic_teh,      Arabic_tatweel  ]     };
     key <AC08> {  [     Arabic_noon,      Arabic_comma    ]     };
@@ -57,7 +57,7 @@ xkb_symbols "basic" {
     key <AB02> {  [    Arabic_hamza,      Arabic_sukun    ]     };
     key <AB03> {  [Arabic_hamzaonwaw,      braceright     ]     };
     key <AB04> {  [       Arabic_ra,       braceleft      ]     };
-    key <AB05> {  [       VoidSymbol,      VoidSymbol     ]     };
+    key <AB05> {  [       0x100fefb,       0x100fef5      ]     };
     key <AB06> {  [Arabic_alefmaksura, Arabic_maddaonalef ]     };
     key <AB07> {  [Arabic_tehmarbuta,    apostrophe       ]     };
     key <AB08> {  [      Arabic_waw,         comma        ]     };
diff --git a/xorg-server/xkbdata.src/symbols/be b/xorg-server/xkbdata.src/symbols/be
index 6e22f8a11..b3c4e53e5 100644
--- a/xorg-server/xkbdata.src/symbols/be
+++ b/xorg-server/xkbdata.src/symbols/be
@@ -27,6 +27,7 @@ xkb_symbols "basic" {
     key <AD01>	{ [         a,          A,           at,  Greek_OMEGA ]	};
     key <AD02>	{ [         z,          Z,      lstroke,      Lstroke ]	};
     key <AD03>	{ [         e,          E,     EuroSign,         cent ]	};
+    key <AD09>  { [         o,          O,           oe,           OE ] }; // o O œ Œ
     key <AD11>	{ [dead_circumflex, dead_diaeresis,  bracketleft, dead_abovering ] };
     key <AD12>	{ [    dollar,   asterisk, bracketright,  dead_macron ]	};
 
@@ -46,6 +47,126 @@ xkb_symbols "basic" {
     include "level3(ralt_switch)"
 };
 
+
+// Variant of the fr(oss) layout for Belgium
+// Copyright © 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+//
+// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
+// │ ³ ≤ │ 1 ≥ │ 2 É │ 3 ˘ │ 4 — │ 5 – │ 6 ™ │ 7 È │ 8 ¡ │ 9 Ç │ 0 À │ ° Ø │ _ ± ┃ ⌫ Retour┃
+// │ ² ¹ │ & | │ é @ │ " # │ ' ¸ │ ( ˇ │ § ^ │ è ` │ ! ~ │ ç { │ à } │ ) ø │ - ‑ ┃  arrière┃
+// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
+// ┃       ┃ A Æ │ Z  │ E ¢ │ R Ê │ T Þ │ Y Ÿ │ U Û │ I Î │ O Œ │ P Ô │ ¨ ˚ │ * ̨ ┃Entrée ┃
+// ┃Tab ↹  ┃ a æ │ z â │ e € │ r ê │ t þ │ y ÿ │ u û │ i î │ o œ │ p ô │ ^ [ │ $ ] ┃   ⏎   ┃
+// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓      ┃
+// ┃        ┃ Q Ä │ S „ │ D Ë │ F ‚ │ G ¥ │ H Ð │ J Ü │ K Ï │ L Ł │ M Ö │ % Ù │ £ ̄ ┃      ┃
+// ┃Maj ⇬   ┃ q ä │ s ß │ d ë │ f ‘ │ g ’ │ h ð │ j ü │ k ï │ l ł │ m ö │ ù ' │ µ ` ┃      ┃
+// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫
+// ┃       ┃ > ≠ │ W “ │ X ” │ C ® │ V ← │ B ↑ │ N → │ ? … │ . . │ / ∕ │ + − ┃             ┃
+// ┃Shift ⇧┃ < \ │ w « │ x » │ c © │ v ⍽ │ b ↓ │ n ¬ │ , ¿ │ ; × │ : ÷ │ = ~ ┃Shift ⇧      ┃
+// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛
+// ┃       ┃       ┃       ┃ ␣              Espace insécable ⍽ ┃       ┃       ┃       ┃
+// ┃Ctrl   ┃Meta   ┃Alt    ┃ ␣ Espace                        ␣ ┃AltGr ⇮┃Menu   ┃Ctrl   ┃
+// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
+partial alphanumeric_keys
+xkb_symbols "oss" {
+
+    include "fr(oss)"
+    include "be(oss_frbe)"
+
+    name[Group1]="Belgium - Alternative";
+};
+
+partial alphanumeric_keys
+xkb_symbols "oss_frbe" {
+    // First row
+    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,         lessthanequal ] }; // ² ³ ¹ ≤ 
+    key <AE01>	{ [        ampersand,                1,                  bar,      greaterthanequal ] }; // & 1 | ≥
+    key <AE02>	{ [           eacute,                2,                   at,                Eacute ] }; // é 2 @ É
+    key <AE04>	{ [       apostrophe,                4,         dead_cedilla,             0x1002014 ] }; // ' 4 ¸ — (tiret cadratin)
+    key <AE05>	{ [        parenleft,                5,           dead_caron,             0x1002013 ] }; // ( 5 ˇ – (tiret demi-cadratin)
+    key <AE06>	{ [          section,                6,          asciicircum,             trademark ] }; // § 6 ^ ™
+    key <AE08>	{ [           exclam,                8,           asciitilde,            exclamdown ] }; // ! 8 ~ ¡
+    key <AE09>	{ [         ccedilla,                9,            braceleft,              Ccedilla ] }; // ç 9 { Ç
+    key <AE10>	{ [           agrave,                0,           braceright,                Agrave ] }; // à 0 } À
+    key <AE11>	{ [       parenright,           degree,               oslash,              Ooblique ] }; // ) ° ø Ø 
+    key <AE12>	{ [            minus,       underscore,            0x1002011,             plusminus ] }; // - _ - (tiret insécable) ±
+
+    // Second row
+    key <AD11>	{ [  dead_circumflex,   dead_diaeresis,          bracketleft,        dead_abovering ] }; // ^ ̈  [ ˚
+    key <AD12>	{ [           dollar,         asterisk,         bracketright,           dead_ogonek ] }; // $ * ] ̨
+
+    // Third row
+    key <AC09>  { [                l,                L,          dead_stroke ] }; // l L ł Ł
+    key <BKSL>	{ [              mu,          sterling,           dead_grave,           dead_macron ] }; // µ £ ` ̄
+
+    // Fourth row
+    key <LSGT>  { [             less,          greater,            backslash,              notequal ] }; // < > \ ≠
+    key <AB10>  { [            equal,             plus,           dead_tilde,             0x1002212 ] }; // = + ~ −
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "oss_latin9" {
+
+    // Restricts the be(oss) layout to latin9 symbols
+
+    include "fr(oss_latin9)"
+    include "be(oss_frbe)"
+    include "keypad(oss_latin9)"
+
+    name[Group1]="Belgium - Alternative, latin-9 only";
+
+    // First row
+    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,                  less ] }; // ² ³ ¹ < 
+    key <AE01>	{ [        ampersand,                1,                  bar,               greater ] }; // & 1 | >
+    key <AE04>	{ [       apostrophe,                4,         dead_cedilla,                 minus ] }; // ' 4 ¸ -
+    key <AE05>	{ [        parenleft,                5,           dead_caron,                 minus ] }; // ( 5 ˇ -
+    key <AE06>	{ [          section,                6,          asciicircum,           asciicircum ] }; // § 6 ^ ^
+    key <AE12>	{ [            minus,       underscore,                minus,             plusminus ] }; // - _ - ±
+
+    // Second row
+    key <AD12>	{ [           dollar,         asterisk,         bracketright,          dead_cedilla ] }; // $ * ] ¸
+
+    // Third row
+    key <AC09>  { [                l,                L,                    l,                     L ] }; // l L l L
+    key <BKSL>	{ [              mu,          sterling,           dead_grave,       dead_circumflex ] }; // µ £ ` ^
+
+    // Fourth row
+    key <LSGT>  { [             less,          greater,            backslash,                 equal ] }; // < > \ =
+    key <AB10>  { [            equal,             plus,           dead_tilde,                 minus ] }; // = + ~ -
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "oss_Sundeadkeys" {
+
+    // Modifies the basic be(oss) layout to use the Sun dead keys
+
+    include "be(oss)"
+
+    // First row
+    key <AE04>	{ [       apostrophe,                4,        SunFA_Cedilla,             0x1002014 ] }; // ' 4 ¸ — (tiret cadratin)
+
+    // Second row
+    key <AD11>	{ [     SunFA_Circum,  SunFA_Diaeresis,          bracketleft,        dead_abovering ] }; // ^ ̈ [ ˚
+
+    //Third row
+    key <AC11>	{ [           ugrave,          percent,          SunFA_Acute,                Ugrave ] }; // ù % ' Ù
+    key <BKSL>	{ [              mu,          sterling,          SunFA_Grave,           dead_macron ] }; // µ £ ` ̄
+
+    // Fourth row
+    key <AB10>  { [            equal,             plus,          SunFA_Tilde,             0x1002212 ] }; // = + ~ −
+};
+
+partial alphanumeric_keys
+xkb_symbols "oss_sundeadkeys" {
+
+    include "be(oss_Sundeadkeys)"
+
+    name[Group1]="Belgium - Alternative, Sun dead keys";
+};
+
+
 partial alphanumeric_keys
 xkb_symbols "iso-alternate" {
     include "be(basic)"
diff --git a/xorg-server/xkbdata.src/symbols/bg b/xorg-server/xkbdata.src/symbols/bg
index 8c4913c86..4e4ca079f 100644
--- a/xorg-server/xkbdata.src/symbols/bg
+++ b/xorg-server/xkbdata.src/symbols/bg
@@ -1,9 +1,5 @@
-// $XKeyboardConfig$
-
-// based on a keyboard map:
-//
 //////////////////////////////////////////////////////////////////////////
-// Copyright (C) 1999, 2000 by Anton Zinoviev <anton@lml.bas.bg>
+// Copyright (C) 1999, 2000, 2005 by Anton Zinoviev <anton@lml.bas.bg>
 //
 // This software may be used, modified, copied, distributed, and sold,
 // in both source and binary form provided that the above copyright
@@ -13,14 +9,13 @@
 // use.
 //
 ////////////////////////////////////////////////////////////////////////// 
-// Version 1.6r1
+// Version 1.9-BAN
 
 partial default alphanumeric_keys
 xkb_symbols "bds" {
-// BDS is the Bulgarian Institute for Standardization
-
   name[Group1]= "Bulgaria";
   
+key.type[Group1] = "TWO_LEVEL";
   key <TLDE> {   [ parenleft,         parenright          ]    };
   key <AE01> {   [ 1,                 exclam              ]    };
   key <AE02> {   [ 2,                 question            ]    };
@@ -32,10 +27,11 @@ xkb_symbols "bds" {
   key <AE08> {   [ 8,                 slash               ]    };
   key <AE09> {   [ 9,                 emdash              ]    };
   key <AE10> {   [ 0,                 numerosign          ]    };
-  key <AE11> {   [ minus,             I                   ]    };
-  key <AE12> {   [ period,            V                   ]    };
+  key <AE11> {   [ minus,             dollar              ]    };
+  key <AE12> {   [ period,            EuroSign            ]    };
 
   key <AD01> {   [ comma,             Cyrillic_yeru       ]    };
+key.type[Group1] = "ALPHABETIC";
   key <AD02> {   [ Cyrillic_u,        Cyrillic_U          ]    };
   key <AD03> {   [ Cyrillic_ie,       Cyrillic_IE         ]    };
   key <AD04> {   [ Cyrillic_i,        Cyrillic_I          ]    };
@@ -46,9 +42,11 @@ xkb_symbols "bds" {
   key <AD09> {   [ Cyrillic_de,       Cyrillic_DE         ]    };
   key <AD10> {   [ Cyrillic_ze,       Cyrillic_ZE         ]    };
   key <AD11> {   [ Cyrillic_tse,      Cyrillic_TSE        ]    };
+key.type[Group1] = "TWO_LEVEL";
   key <AD12> {   [ semicolon,         section             ]    };
 
-  key <AC01> {   [ Cyrillic_softsign, Cyrillic_SOFTSIGN   ]    };
+key.type[Group1] = "ALPHABETIC";
+  key <AC01> {   [ Cyrillic_softsign, U045D               ]    };
   key <AC02> {   [ Cyrillic_ya,       Cyrillic_YA         ]    };
   key <AC03> {   [ Cyrillic_a,        Cyrillic_A          ]    };
   key <AC04> {   [ Cyrillic_o,        Cyrillic_O          ]    };
@@ -59,7 +57,6 @@ xkb_symbols "bds" {
   key <AC09> {   [ Cyrillic_ve,       Cyrillic_VE         ]    };
   key <AC10> {   [ Cyrillic_em,       Cyrillic_EM         ]    };
   key <AC11> {   [ Cyrillic_che,      Cyrillic_CHE        ]    };
-  key <BKSL> {   [ apostrophe,        Cyrillic_YERU       ]    };
 
   key <AB01> {   [ Cyrillic_yu,       Cyrillic_YU         ]    };
   key <AB02> {   [ Cyrillic_shorti,   Cyrillic_SHORTI     ]    };
@@ -72,14 +69,22 @@ xkb_symbols "bds" {
   key <AB09> {   [ Cyrillic_el,       Cyrillic_EL         ]    };
   key <AB10> {   [ Cyrillic_be,       Cyrillic_BE         ]    };
     
+key.type[Group1] = "TWO_LEVEL";
+  key <BKSL> {   [ doublelowquotemark,leftdoublequotemark ]    };
+
+  key <LSGT> {   [ Cyrillic_softsign, Cyrillic_SOFTSIGN   ]    };
+
   // End alphanumeric section
   
+  key <KPDL> {   type[Group1] = "KEYPAD",
+                 [ KP_Delete,         KP_Separator        ]    };
+
 };
 
 partial alphanumeric_keys 
 xkb_symbols "phonetic" {
   
-  name[Group1]= "Bulgaria - Phonetic";
+  name[Group1]= "Bulgaria - Traditional Phonetic";
   
   key <TLDE> {   [ Cyrillic_che,      Cyrillic_CHE        ]    };
   key <AE01> {   [ 1,                 exclam              ]    };
@@ -135,3 +140,73 @@ xkb_symbols "phonetic" {
   // End alphanumeric section
 
 };
+
+partial alphanumeric_keys
+xkb_symbols "bas_phonetic" {
+  name[Group1]= "Bulgaria - Standard Phonetic";
+
+key.type[Group1] = "ALPHABETIC";
+  key <TLDE> {   [ Cyrillic_yu,         Cyrillic_YU          ]    };
+key.type[Group1] = "TWO_LEVEL";
+  key <AE01> {   [ 1,                   exclam               ]    };
+  key <AE02> {   [ 2,                   at                   ]    };
+  key <AE03> {   [ 3,                   numerosign           ]    };
+  key <AE04> {   [ 4,                   dollar               ]    };
+  key <AE05> {   [ 5,                   percent              ]    };
+  key <AE06> {   [ 6,                   EuroSign             ]    };
+  key <AE07> {   [ 7,                   section              ]    };
+  key <AE08> {   [ 8,                   asterisk             ]    };
+  key <AE09> {   [ 9,                   parenleft            ]    };
+  key <AE10> {   [ 0,                   parenright           ]    };
+  key <AE11> {   [ minus,               emdash               ]    };
+  key <AE12> {   [ equal,               plus                 ]    };
+
+key.type[Group1] = "ALPHABETIC";
+  key <LatQ> {   [ Cyrillic_che,        Cyrillic_CHE         ]    };
+  key <LatW> {   [ Cyrillic_sha,        Cyrillic_SHA         ]    };
+  key <LatE> {   [ Cyrillic_ie,         Cyrillic_IE          ]    };
+  key <LatR> {   [ Cyrillic_er,         Cyrillic_ER          ]    };
+  key <LatT> {   [ Cyrillic_te,         Cyrillic_TE          ]    };
+  key <LatY> {   [ Cyrillic_hardsign,   Cyrillic_HARDSIGN    ]    };
+  key <LatU> {   [ Cyrillic_u,          Cyrillic_U           ]    };
+  key <LatI> {   [ Cyrillic_i,          Cyrillic_I           ]    };
+  key <LatO> {   [ Cyrillic_o,          Cyrillic_O           ]    };
+  key <LatP> {   [ Cyrillic_pe,         Cyrillic_PE          ]    };
+  key <AD11> {   [ Cyrillic_ya,         Cyrillic_YA          ]    };
+  key <AD12> {   [ Cyrillic_shcha,      Cyrillic_SHCHA       ]    };
+
+  key <LatA> {   [ Cyrillic_a,          Cyrillic_A           ]    };
+  key <LatS> {   [ Cyrillic_es,         Cyrillic_ES          ]    };
+  key <LatD> {   [ Cyrillic_de,         Cyrillic_DE          ]    };
+  key <LatF> {   [ Cyrillic_ef,         Cyrillic_EF          ]    };
+  key <LatG> {   [ Cyrillic_ghe,        Cyrillic_GHE         ]    };
+  key <LatH> {   [ Cyrillic_ha,         Cyrillic_HA          ]    };
+  key <LatJ> {   [ Cyrillic_shorti,     Cyrillic_SHORTI      ]    };
+  key <LatK> {   [ Cyrillic_ka,         Cyrillic_KA          ]    };
+  key <LatL> {   [ Cyrillic_el,         Cyrillic_EL          ]    };
+key.type[Group1] = "TWO_LEVEL";
+  key <AC10> {   [ semicolon,           colon                ]    };
+  key <AC11> {   [ apostrophe,          quotedbl             ]    };
+key.type[Group1] = "ALPHABETIC";
+  key <BKSL> {   [ Cyrillic_softsign,   U045D                ]    };
+
+  key <LatZ> {   [ Cyrillic_ze,         Cyrillic_ZE          ]    };
+  key <LatX> {   [ Cyrillic_zhe,        Cyrillic_ZHE         ]    };
+  key <LatC> {   [ Cyrillic_tse,        Cyrillic_TSE         ]    };
+  key <LatV> {   [ Cyrillic_ve,         Cyrillic_VE          ]    };
+  key <LatB> {   [ Cyrillic_be,         Cyrillic_BE          ]    };
+  key <LatN> {   [ Cyrillic_en,         Cyrillic_EN          ]    };
+  key <LatM> {   [ Cyrillic_em,         Cyrillic_EM          ]    };
+key.type[Group1] = "TWO_LEVEL";
+  key <AB08> {   [ comma,               doublelowquotemark   ]    };
+  key <AB09> {   [ period,              leftdoublequotemark  ]    };
+  key <AB10> {   [ slash,               question             ]    };
+
+  key <LSGT> {   [ Cyrillic_softsign,   Cyrillic_SOFTSIGN    ]    };
+
+  // End alphanumeric section
+
+  key <KPDL> {   type[Group1] = "KEYPAD",
+                 [ KP_Delete,           KP_Separator         ]    };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/brai b/xorg-server/xkbdata.src/symbols/brai
new file mode 100644
index 000000000..e89bed24f
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/brai
@@ -0,0 +1,62 @@
+// $XKeyboardConfig$
+
+// 10-dot patterns on the home row + v and n
+partial default alphanumeric_keys
+xkb_symbols "home_row" {
+    include "brai(keypad)"
+
+    name[Group1]="Braille";
+
+    key <AC04>	{ [ braille_dot_1 ] };
+    key <AC03>	{ [ braille_dot_2 ] };
+    key <AC02>	{ [ braille_dot_3 ] };
+    key <AC07>	{ [ braille_dot_4 ] };
+    key <AC08>	{ [ braille_dot_5 ] };
+    key <AC09>	{ [ braille_dot_6 ] };
+    key <AC01>	{ [ braille_dot_7 ] };
+    key <AC10>	{ [ braille_dot_8 ] };
+    key <AB04>	{ [ braille_dot_9 ] };
+    key <AB06>	{ [ braille_dot_10 ] };
+};
+
+// 6-dot patterns for the left hand
+partial alphanumeric_keys
+xkb_symbols "left_hand" {
+    include "brai(keypad)"
+
+    name[Group1]="Braille - Left hand";
+
+    key <AC03>	{ [ braille_dot_1 ] };
+    key <AC02>	{ [ braille_dot_2 ] };
+    key <AC01>	{ [ braille_dot_3 ] };
+    key <AC04>	{ [ braille_dot_4 ] };
+    key <AB05>	{ [ braille_dot_5 ] };
+    key <AB04>	{ [ braille_dot_6 ] };
+};
+
+// 6-dot patterns for the right hand
+partial alphanumeric_keys
+xkb_symbols "right_hand" {
+    include "brai(keypad)"
+
+    name[Group1]="Braille - Right hand";
+
+    key <AC07>	{ [ braille_dot_1 ] };
+    key <AB05>	{ [ braille_dot_2 ] };
+    key <AB06>	{ [ braille_dot_3 ] };
+    key <AC08>	{ [ braille_dot_4 ] };
+    key <AC09>	{ [ braille_dot_5 ] };
+    key <AC10>	{ [ braille_dot_6 ] };
+};
+
+// 6-dot patterns on the keypad
+partial hidden keypad_keys
+xkb_symbols "keypad" {
+    key <KP4>	{ [ braille_dot_1 ] };
+    key <KP1>	{ [ braille_dot_2 ] };
+    key <KP0>	{ [ braille_dot_3 ] };
+    key <KP5>	{ [ braille_dot_4 ] };
+    key <KP6>	{ [ braille_dot_5 ] };
+    key <KPAD>	{ [ braille_dot_6 ] };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/ca b/xorg-server/xkbdata.src/symbols/ca
index c198fafd9..818a8ff7b 100644
--- a/xorg-server/xkbdata.src/symbols/ca
+++ b/xorg-server/xkbdata.src/symbols/ca
@@ -476,9 +476,16 @@ xkb_symbols "shs" {
 // OLPC Section
 xkb_symbols "olpc" {
 
-    include "fr"
-
-    key <AE03>	{ [          3,    slash,          ograve,        Ograve ] };
+    include "ca(fr)"
+    
+    key <AE02>	{ [          2,    quotedbl,          ograve,        Ograve ] };
+    key <AE03>	{ [          3,    slash,          at,        VoidSymbol ] };
+    
+    key <AD03>	{ [          e,    E,          EuroSign, VoidSymbol]	};
+        
+    key <AB09>	{ [  period,         period,         0x1002010 ]	};
+    
+    key <I219>  { [  guillemotleft,  guillemotright, degree, VoidSymbol ] };
 };
 
 partial alphanumeric_keys 
@@ -509,3 +516,10 @@ xkb_symbols "kut" {
     //MODIFIER LETTER RIGHT HALF RING
     key <AC10> {	[ semicolon,	colon,U02BE,U02BE	]	};
 };
+
+partial alphanumeric_keys 
+xkb_symbols "eng" {
+    name[Group1] = "Canada - English";
+    include "us(basic)"
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/capslock b/xorg-server/xkbdata.src/symbols/capslock
index 735e148cb..58599c6e6 100644
--- a/xorg-server/xkbdata.src/symbols/capslock
+++ b/xorg-server/xkbdata.src/symbols/capslock
@@ -2,19 +2,19 @@
 
 default partial hidden modifier_keys
 xkb_symbols "capslock" {
-    key <CAPS> {	[	Caps_Lock		]	};
+    replace key <CAPS> {	[	Caps_Lock		]	};
     modifier_map Lock { Caps_Lock };
 };
 
 partial hidden modifier_keys
 xkb_symbols "shiftlock" {
-    key <CAPS> {	[	Shift_Lock		]	};
+    replace key <CAPS> {	[	Shift_Lock		]	};
     modifier_map Shift { Shift_Lock };
 };
 
 partial hidden modifier_keys
 xkb_symbols "grouplock" {
-    key <CAPS> {	[	ISO_Next_Group,	Caps_Lock	]	};
+    replace key <CAPS> {	[	ISO_Next_Group,	Caps_Lock	]	};
 };
 
 partial hidden modifier_keys
@@ -31,3 +31,13 @@ xkb_symbols "groupshift" {
     };
 };
 
+partial hidden modifier_keys
+xkb_symbols "escape" {
+    key <CAPS> {        [       Escape  ]       };
+};
+
+partial hidden modifier_keys
+xkb_symbols "backspace" {
+    key <CAPS> {        [       BackSpace  ]       };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/compose b/xorg-server/xkbdata.src/symbols/compose
index 72e92efc3..521d93eb9 100644
--- a/xorg-server/xkbdata.src/symbols/compose
+++ b/xorg-server/xkbdata.src/symbols/compose
@@ -29,7 +29,7 @@ xkb_symbols "rctrl" {
 
 partial modifier_keys
 xkb_symbols "caps" {
-    key <CAPS> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+    replace key <CAPS> { type="TWO_LEVEL", [ Multi_key, Multi_key ] };
 };
 
 partial modifier_keys
diff --git a/xorg-server/xkbdata.src/symbols/ctrl b/xorg-server/xkbdata.src/symbols/ctrl
index ca3b8bdc1..e9c4efff5 100644
--- a/xorg-server/xkbdata.src/symbols/ctrl
+++ b/xorg-server/xkbdata.src/symbols/ctrl
@@ -5,15 +5,15 @@
 // eliminate the caps lock key completely (replace with control)
 partial modifier_keys 
 xkb_symbols "nocaps" {
-    key <CAPS>	{  symbols[Group1]= [ Control_L, Control_L ] };
+    replace key <CAPS>	{  [ Control_L, Control_L ] };
     modifier_map  Control { <CAPS>, <LCTL> };
 };
 
 // swap the caps lock key with the left control key
 partial modifier_keys 
 xkb_symbols "swapcaps" {
-    key <CAPS>	{  symbols[Group1]= [ Control_L ] };
-    key <LCTL>	{  symbols[Group1]= [ Caps_Lock ] };
+    replace key <CAPS>	{  [ Control_L ] };
+    replace key <LCTL>	{  [ Caps_Lock ] };
 };
 
 // moves the control key to the middle row and the caps lock
@@ -21,8 +21,8 @@ xkb_symbols "swapcaps" {
 // file has defined appropriate aliases for the keys in question.
 partial modifier_keys 
 xkb_symbols "ctrl_ac" {
-    key <AC00>	{  symbols[Group1]= [ Control_L ] };
-    key <AA00>	{  symbols[Group1]= [ Caps_Lock ] };
+    replace key <AC00>	{  [ Control_L ] };
+    replace key <AA00>	{  [ Caps_Lock ] };
 };
 
 // Moves the control key to the bottom row and the caps lock
@@ -30,8 +30,8 @@ xkb_symbols "ctrl_ac" {
 // file has defined appropriate aliases for the keys in question.
 partial modifier_keys 
 xkb_symbols "ctrl_aa" {
-    key <AA00>	{  symbols[Group1]= [ Control_L ] };
-    key <AC00>	{  symbols[Group1]= [ Caps_Lock ] };
+    replace key <AA00>	{  [ Control_L ] };
+    replace key <AC00>	{  [ Caps_Lock ] };
 };
 
 // Right Ctrl works as Right Alt
diff --git a/xorg-server/xkbdata.src/symbols/de b/xorg-server/xkbdata.src/symbols/de
index 3674182dc..25f883ee7 100644
--- a/xorg-server/xkbdata.src/symbols/de
+++ b/xorg-server/xkbdata.src/symbols/de
@@ -32,12 +32,21 @@ xkb_symbols "basic" {
     key <AD11>	{ [udiaeresis, Udiaeresis, dead_diaeresis, dead_abovering ] };
     key <AD12>	{ [      plus,   asterisk,   dead_tilde,  dead_macron ]	};
 
-    key <AC10>	{ [odiaeresis, Odiaeresis, dead_doubleacute, dead_doubleacute ] };
-    key <AC11>	{ [adiaeresis, Adiaeresis, dead_circumflex, dead_caron]	};
-    key <TLDE>	{ [dead_circumflex, degree,     notsign,      notsign ]	};
+    key <AC02>  { [         s,          S,                U017F,     U1E9E    ] };
+    key <AC07>  { [         j,          J,        dead_belowdot, dead_abovedot   ] };
+    key <AC10>	{ [odiaeresis, Odiaeresis, dead_doubleacute, dead_belowdot ] };
+    key <AC11>	{ [adiaeresis, Adiaeresis, dead_circumflex, dead_caron ] };
+    key <TLDE>	{ [dead_circumflex, degree,	U2032,    U2033	] };
 
     key <BKSL>	{ [numbersign, apostrophe,   dead_grave,   dead_breve ]	};
-    key <AB01>	{ [         y,          Y, guillemotleft,        less ]	};
+    key <AB01>	{ [         y,          Y,       guillemotright,    U203A 	] };
+    key <AB02>	{ [         x,          X,        guillemotleft,    U2039 	] };
+    key <AB04>	{ [         v,          V,   doublelowquotemark, singlelowquotemark ]	};
+    key <AB05>	{ [         b,          B,  leftdoublequotemark, leftsinglequotemark ] };
+    key <AB06>	{ [         n,          N, rightdoublequotemark, rightsinglequotemark ]	};    
+    key <AB08>  { [     comma,  semicolon,       periodcentered,     multiply	] };
+    key <AB09>	{ [    period,      colon,                U2026,     division 	] };
+    key <AB10>	{ [     minus, underscore,               endash,     emdash	] };
 
     include "kpdl(comma)"
 
@@ -53,7 +62,7 @@ xkb_symbols "nodeadkeys" {
     name[Group1]="Germany - Eliminate dead keys";
 
     key <TLDE>	{ [asciicircum,    degree,      notsign,      notsign ]	};
-    key <AE12>	{ [apostrophe,      grave,      cedilla,      cedilla ]	};
+    key <AE12>	{ [     acute,      grave,      cedilla,      cedilla ]	};
     key <AD11>	{ [udiaeresis, Udiaeresis,    diaeresis,    diaeresis ]	};
     key <AD12>	{ [      plus,   asterisk,   asciitilde,       macron ]	};
     key <AC10>	{ [odiaeresis, Odiaeresis,  doubleacute,  doubleacute ]	};
@@ -203,110 +212,179 @@ xkb_symbols "sundeadkeys" {
 };
 
 
-// German NEO Eurokeys-Style
+// German NEO-Layout Version 2.0rc1 (rev: 1331)
 // adopted 2004 by Hanno Behrens <Hanno.Behrens@gmx.de>
 // inspired by Dvorak/de-ergo  http://www.goebel-consult.de/de-ergo/
+//
+// Authors: 
+//      <lucky at zankt dot net>
+//      Benjamin Kellermann <Benjamin dot Kellermann at gmx dot Germany>
+//      Erik Streb <mail at erikstreb dot de>
+//        and many other contributers
+//
+//      http://www.neo-layout.org
 
-partial alphanumeric_keys 
-xkb_symbols "neo" {
-
-    include "us(dvorak)"
-
-    name[Group1]= "Germany - Neostyle";
-
-    key <TLDE> { [ dead_circumflex, degree, notsign, paragraph	] };
-
-    key <AE01> { [	    1,	exclam, exclamdown, onesuperior	] };
-    key <AE02> { [	    2,	quotedbl,   dead_diaeresis, twosuperior ] };
-    key <AE03> { [	    3,	paragraph, sterling, threesuperior ] };
-    key <AE04> { [	    4,	dollar,    currency, onequarter	] };
-    key <AE05> { [	    5,	percent,    bar,	onehalf	] };
-    key <AE06> { [	    6,	ampersand,  brokenbar, threequarters ] };
-    key <AE07> { [	    7,	slash,      braceleft, division	] };
-    key <AE08> { [	    8,	parenleft,  bracketleft, guillemotleft ] };
-    key <AE09> { [	    9,	parenright, bracketright, guillemotright ] };
-    key <AE10> { [	    0,	equal,	    braceright		] };
-    key <AE11> { [	minus,	underscore, hyphen, diaeresis	 ] };
-    key <AE12> { [ dead_acute,dead_grave,   dead_cedilla, dead_ogonek  ] };
-
-    key <AD01> { [ 	    q,  Q,	at			 ] };
-    key <AD02> { [	    v,	V,	masculine, ordfeminine   ] };
-    key <AD03> { [	    l,	L,      lstroke, Lstroke	 ] };
-    key <AD04> { [	    c,	C,      ccedilla,copyright	 ] };
-    key <AD05> { [	    w,	W,	Greek_omega, Greek_OMEGA ] };
-    key <AD06> { [	    k,	K,	Greek_kappa, Greek_KAPPA ] };
-    key <AD07> { [	    h,	H,      Greek_epsilon, Greek_EPSILON ] };
-    key <AD08> { [	    g,	G, 	Greek_gamma, Greek_GAMMA ] };
-    key <AD09> { [	    f,	F,      ordfeminine		 ] };
-    key <AD10> { [	    j,	J,	Greek_iota, Greek_IOTA	 ] };
-    key <AD11> { [  ssharp, question, 	backslash, questiondown  ] };
-    key <AD12> { [	 plus,	asterisk,   dead_tilde,	plusminus ] };
-
-    key <AC01> { [	    u,	U,	Greek_delta, Greek_DELTA ] };
-    key <AC02> { [	    i,	I,      idotless, Iabovedot	 ] };
-    key <AC03> { [	    a,	A,      at, Greek_alpha		 ] };
-    key <AC04> { [	    e,	E,      EuroSign,	cent	 ] };
-    key <AC05> { [	    o,	O,	oslash,	Ooblique	 ] };
-    key <AC06> { [	    s,	S,      Greek_sigma, Greek_SIGMA ] };
-    key <AC07> { [	    n,	N,	Greek_nu, Greek_NU	 ] };
-    key <AC08> { [	    r,	R,      registered,trademark	 ] };
-    key <AC09> { [	    t,	T,      thorn,          THORN	 ] };	//Greek_theta, Greek_THETA/tcedilla, Tcedilla
-    key <AC10> { [	    d,	D,      eth,		ETH	 ] };
-    key <AC11> { [	    y,	Y,      yen			 ] };
-    key <BKSL> { [ numbersign, apostrophe, grave		 ] };
-
-    
-    key <LSGT> { [  less, greater, 	guillemotleft, guillemotright	] };
-    key <AB01> { [ odiaeresis, Odiaeresis, oe, OE		 ] };
-    key <AB02> { [ udiaeresis,Udiaeresis, apostrophe, asciitilde ] };  
-    key <AB03> { [ adiaeresis, Adiaeresis, ae, AE		 ] };
-    key <AB04> { [	    p,	P,      thorn,	THORN		 ] };
-    key <AB05> { [	    z,	Z,	Greek_zeta, Greek_ZETA	 ] };
-    key <AB06> { [	    b,	B,	Greek_beta, Greek_BETA	 ] };
-    key <AB07> { [	    m,	M,	mu, Greek_MU			 ] };
-    key <AB08> { [	comma,	semicolon, dead_cedilla, cedilla ] };
-    key <AB09> { [      period,	colon,  periodcentered		 ] };
-    key <AB10> { [	    x,	X,      multiply		 ] };
-
-    key <SPCE> { [	 space,	space, nobreakspace, nobreakspace ] };
-
-    
-    // End "Editing" section, begin "Keypad"
-//    key <NMLK> {	[  Num_Lock, Pointer_EnableKeys		]	};
-
-// Ungrab cancels server/keyboard/pointer grabs
-//    key <KPDV> {  [KP_Divide, KP_Divide, division]  };
-
-// ClsGrb kills whichever client has a grab in effect
-//    key <KPMU> {  [KP_Multiply, KP_Multiply, periodcentered]  };
-
-// -VMode switches to the previous video mode
-//    key <KPSU> { [ KP_Subtract, KP_Subtract, notsign]   };
-
-    key  <KP7> {	[  KP_Home,	KP_7, seveneighths, oneeighth	]	};
-    key  <KP8> {	[  KP_Up,	KP_8, uparrow, fiveeighths	]	};
-    key  <KP9> {	[  KP_Prior,	KP_9, threeeighths, threeeighths ]	};
-
-// +VMode switches to the next video mode
-//    key <KPAD> {	[  KP_Add, KP_Add, plusminus ]    };
-
-    key  <KP4> {	[  KP_Left,	KP_4, leftarrow, onequarter		]	};
-    key  <KP5> {	[  KP_Begin,	KP_5, dagger, onehalf 			]	};
-    key  <KP6> {	[  KP_Right,	KP_6, rightarrow, threequarters	]	};
 
-    key  <KP1> {	[  KP_End,	KP_1, onesuperior, onesuperior		]	};
-    key  <KP2> {	[  KP_Down,	KP_2, downarrow, twosuperior		]	};
-    key  <KP3> {	[  KP_Next,	KP_3, threesuperior, threesuperior	]	};
-    key <KPEN> {	[  	KP_Enter	]	};
-    key <KPEQ> {	[  	KP_Equal	]	};
+partial alphanumeric_keys modifier_keys keypad_keys
+xkb_symbols "neo" {
 
-    key  <KP0> {	[  KP_Insert,	KP_0, percent, degree			]	};
-    key <KPDL> {  	[  KP_Delete,	KP_Decimal, periodcentered, comma  ]	};
-    // End "Keypad" section
+    name[Group1]= "Germany - Neo 2";
+
+    // Levels in Neo jargon
+    // --------------------------------------------------------------
+    // Ebene 1: normal
+    // Ebene 2: Shift
+    // Ebene 3: Mod3
+    // Ebene 4: Mod4 (for marking something use Shift+Mod4)
+    // Ebene 5: Shift+Mod3
+    // Ebene 6: Mod3+Mod4 (in this order)
+    // Compose (not a level): Mod3+Tab
+    // Feststelltaste (Capslock): Mod3+Mod3
+    //
+    // Levels in Xkbmap jargon to be found here in the definitions. 
+    // These are the levels used, and Xorg's translations with type="EIGHT_LEVEL":
+    // --------------------------------------------------------------
+    //   Modifier:        None    Shift   Mod3    Shift+Mod3  Mod4    Shift+Mod4    Mod3+Mod4
+    //   Xorg calls it:   Level1  Level2  Level3  Level4      Level5  Level6        Level7
+    //   Neo calls it:    Ebene1  Ebene2  Ebene3  Ebene5      Ebene4  Ebene4+Shift  Ebene6
+
+    // Modifier definitions
+    // --------------------------------------------------------------
+    // Definition of the so called Neo-Mod3
+    key.type[Group1]="THREE_LEVEL";
+    key <BKSL> { [ ISO_Level3_Shift, ISO_Level3_Shift,  Caps_Lock ] };
+    key <CAPS> { [ ISO_Level3_Shift, ISO_Level3_Shift,  Caps_Lock ] };
+
+    // Definition of the so called Neo-Mod4
+    key.type[Group1]="ONE_LEVEL";
+    key <LSGT> { [ ISO_Level5_Shift ]};
+    key <RALT> { [ ISO_Level5_Shift ]};
+    modifier_map Mod3 { <LSGT>, <RALT> };
+    // Attention: ^^^ This is a X server variable, not the Neo-Mod3.
+
+    key.type[Group1]="EIGHT_LEVEL_ALPHABETIC" ;
+
+    // Tab as Multi_key (Compose)
+    // --------------------------------------------------------------
+    key  <TAB> { [ Tab, ISO_Left_Tab, Multi_key ] };
+
+    // number row
+    // --------------------------------------------------------------
+    key <TLDE> { [ dead_circumflex, dead_tilde,         dead_abovering,         dead_breve,         dead_caron,     NoSymbol,    dead_macron    ] };
+
+    key <AE01> { [ 1,           degree,                 onesuperior,            onesubscript,       ordfeminine,    NoSymbol,    notsign        ] };
+    key <AE02> { [ 2,           section,                twosuperior,            twosubscript,       masculine,      NoSymbol,    logicalor      ] };
+    key <AE03> { [ 3,           U2113,                  threesuperior,          threesubscript,     numerosign,     NoSymbol,    logicaland     ] };
+    key <AE04> { [ 4,           guillemotright,         U203A,                  dagger,             Prior,          Prior,       U22A5          ] };
+    key <AE05> { [ 5,           guillemotleft,          U2039,                  femalesymbol,       periodcentered, NoSymbol,    U2221          ] };
+    key <AE06> { [ 6,           EuroSign,               cent,                   malesymbol,         sterling,       NoSymbol,    U2225          ] };
+
+    key <AE07> { [ 7,           dollar,                 yen,                    Greek_kappa,        currency,       NoSymbol,    rightarrow     ] };
+    key <AE08> { [ 8,           doublelowquotemark,     singlelowquotemark,     leftanglebracket,   NoSymbol,       NoSymbol,    U221E          ] };
+    key <AE09> { [ 9,           leftdoublequotemark,    leftsinglequotemark,    rightanglebracket,  slash,          NoSymbol,    U220B          ] };
+    key <AE10> { [ 0,           rightdoublequotemark,   rightsinglequotemark,   zerosubscript,      asterisk,       NoSymbol,    emptyset       ] };
+
+    key <AE11> { [ minus,       emdash,                 NoSymbol,               U2011,              minus,          NoSymbol,    hyphen         ] };
+    key <AE12> { [ dead_grave,  NoSymbol,               dead_diaeresis,         dead_dasia,         U030F,          NoSymbol,    NoSymbol       ] };
+
+    key <BKSP> { [ BackSpace,   BackSpace,              BackSpace,              BackSpace,          BackSpace,      BackSpace,   BackSpace      ] };
+
+    // top row
+    // --------------------------------------------------------------
+    // xvlcwkhgfqß
+    key <AD01> { [ x,           X,                      ellipsis,               Greek_xi,           U22EE,          NoSymbol,    Greek_XI         ] };
+    key <AD02> { [ v,           V,                      underscore,             NoSymbol,           BackSpace,      BackSpace,   U2259            ] };
+    key <AD03> { [ l,           L,                      bracketleft,            Greek_lambda,       Up,             Up,          Greek_LAMBDA     ] };
+    key <AD04> { [ c,           C,                      bracketright,           Greek_chi,          Delete,         Delete,      U2102            ] };
+    key <AD05> { [ w,           W,                      asciicircum,            Greek_omega,        Insert,         Insert,      Greek_OMEGA      ] };
+
+    key <AD06> { [ k,           K,                      exclam,                 U03F0,              exclamdown,     NoSymbol,    radical          ] };
+    key <AD07> { [ h,           H,                      less,                   Greek_psi,          7,              NoSymbol,    Greek_PSI        ] };
+    key <AD08> { [ g,           G,                      greater,                Greek_gamma,        8,              NoSymbol,    Greek_GAMMA      ] };
+    key <AD09> { [ f,           F,                      equal,                  Greek_phi,          9,              NoSymbol,    Greek_PHI        ] };
+    key <AD10> { [ q,           Q,                      ampersand,              U03D5,              plus,           NoSymbol,    U211A            ] };
+    key <AD11> { [ ssharp,      U1E9E,                  U017F,              Greek_finalsmallsigma,  NoSymbol,       NoSymbol,    jot              ] };
+
+    key <AD12> { [ dead_acute,  dead_cedilla,           dead_stroke,            dead_psili,         dead_doubleacute,NoSymbol,   dead_abovedot    ] };
+
+    // middle row
+    // --------------------------------------------------------------
+    // uiaeosnrtdy
+    key <AC01> { [ u,           U,                      backslash,              NoSymbol,           Home,           Home,        U222E             ] };
+    key <AC02> { [ i,           I,                      slash,                  Greek_iota,         Left,           Left,        integral          ] };
+    key <AC03> { [ a,           A,                      braceleft,              Greek_alpha,        Down,           Down,        U2200             ] };
+    key <AC04> { [ e,           E,                      braceright,             Greek_epsilon,      Right,          Right,       U2203             ] };
+    key <AC05> { [ o,           O,                      asterisk,               Greek_omicron,      End,            End,         elementof         ] };
+
+    key <AC06> { [ s,           S,                      question,               Greek_sigma,        questiondown,   NoSymbol,    Greek_SIGMA       ] };
+    key <AC07> { [ n,           N,                      parenleft,              Greek_nu,           4,              NoSymbol,    U2115             ] };
+    key <AC08> { [ r,           R,                      parenright,             U03F1,              5,              NoSymbol,    U211D             ] };
+    key <AC09> { [ t,           T,                      minus,                  Greek_tau,          6,              NoSymbol,    partialderivative ] };
+    key <AC10> { [ d,           D,                      colon,                  Greek_delta,        comma,          NoSymbol,    Greek_DELTA       ] };
+    key <AC11> { [ y,           Y,                      at,                     Greek_upsilon,      period,         NoSymbol,    nabla             ] };
+
+    // bottom row
+    // --------------------------------------------------------------
+    // üöäpzbm,.j
+    key <AB01> { [ udiaeresis,  Udiaeresis,             numbersign,             NoSymbol,           Escape,         Escape,      U211C             ] };
+    key <AB02> { [ odiaeresis,  Odiaeresis,             dollar,                 NoSymbol,           Tab,            Tab,         U2111             ] };
+    key <AB03> { [ adiaeresis,  Adiaeresis,             bar,                    Greek_eta,          Next,           Next,        U2135             ] };
+    key <AB04> { [ p,           P,                      asciitilde,             Greek_pi,           Return,         Return,      Greek_PI          ] };
+    key <AB05> { [ z,           Z,                      grave,                  Greek_zeta,         NoSymbol,       NoSymbol,    U2124             ] };
+
+    key <AB06> { [ b,           B,                      plus,                   Greek_beta,         colon,          NoSymbol,    U21D0             ] };
+    key <AB07> { [ m,           M,                      percent,                Greek_mu,           1,              NoSymbol,    ifonlyif          ] };
+    key <AB08> { [ comma,       endash,                 quotedbl,               Greek_rho,          2,              NoSymbol,    U21D2             ] };
+    key <AB09> { [ period,      enfilledcircbullet,     apostrophe,             U03D1,              3,              NoSymbol,    Greek_THETA       ] };
+    key <AB10> { [ j,           J,                      semicolon,              Greek_theta,        semicolon,      NoSymbol,    variation         ] };
+
+    // Space key
+    // --------------------------------------------------------------
+    key <SPCE> { [ space,       space,                  space,                  nobreakspace,       0,              NoSymbol,    U202F             ] };
+
+    // Keypad
+    // ===========
+
+    // Num-Lock is no longer used with Neo:
+    //key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD";
+
+    // the former Numlock key:
+    key <NMLK> { [ Tab,           ISO_Left_Tab,   equal,        approxeq,     notequal,   NoSymbol,   identical ] };
+
+    // topmost row
+    // --------------------------------------------------------------
+    key <KPDV> { [ KP_Divide,     KP_Divide,      division,     U2223,        U2300,      NoSymbol,   U2044 ] };
+    key <KPMU> { [ KP_Multiply,   KP_Multiply,    U22C5,        multiply,     U2299,      NoSymbol,   U2297 ] };
+    key <KPSU> { [ KP_Subtract,   KP_Subtract,    U2212,        U2216,        U2296,      NoSymbol,   U2238 ] };
+
+    // top row
+    // --------------------------------------------------------------
+    key  <KP7> { [ KP_7,          U2714,          U2195,        U226A,        KP_Home,    KP_Home,    upstile ] };
+    key  <KP8> { [ KP_8,          U2718,          uparrow,      intersection, KP_Up,      KP_Up,      U22C2   ] };
+    key  <KP9> { [ KP_9,          NoSymbol,       U20D7,        U226B,        KP_Prior,   KP_Prior,   U2309   ] };
+    key <KPAD> { [ KP_Add,        KP_Add,         plusminus,    U2213,        U2295,      NoSymbol,   U2214   ] };
+
+    // middle row
+    // --------------------------------------------------------------
+    key  <KP4> { [ KP_4,          club,           leftarrow,    includedin,   KP_Left,    KP_Left,    U2286 ] };
+    key  <KP5> { [ KP_5,          EuroSign,       brokenbar,    U22B6,        KP_Begin,   KP_Begin,   U22B7 ] };
+    key  <KP6> { [ KP_6,          NoSymbol,       rightarrow,   includes,     KP_Right,   KP_Right,   U2287 ] };
+
+    // bottom row
+    // --------------------------------------------------------------
+    key  <KP1> { [ KP_1,          diamond,        U2194,        lessthanequal,KP_End,     KP_End,     downstile ] };
+    key  <KP2> { [ KP_2,          heart,          downarrow,    union,        KP_Down,    KP_Down,    U22C3     ] };
+    key  <KP3> { [ KP_3,          U2660,          U21CC,     greaterthanequal,KP_Next,    KP_Next,    U230B     ] };
+    key <KPEN> { [ KP_Enter,      KP_Enter,       KP_Enter,     KP_Enter,     KP_Enter,   KP_Enter,   KP_Enter  ] };
+    key <KPEQ> { [ KP_Equal ] };
+
+    // bottommost row
+    // --------------------------------------------------------------
+    key  <KP0> { [ KP_0,         U2423,           percent,   U2030,        KP_Insert,   KP_Insert,   U25A1    ] };
+    key <KPDL> { [ KP_Decimal,   comma,           period,    apostrophe,   KP_Delete,   KP_Delete,   quotedbl ] };
 
-    include "level3(ralt_switch)"
 };
- 
+
 // Copied from macintosh_vndr/de
 // olh@suse.de   very close to MacOS map
 
@@ -354,3 +432,66 @@ xkb_symbols "mac_nodeadkeys" {
 
     key <BKSL>	{ [ numbersign, apostrophe,       grave       ]	};
 };
+
+partial alphanumeric_keys
+xkb_symbols "dsb"
+{
+	name[Group1] = "Germany - Lower Sorbian";
+	include "latin(basic)"
+	include "level3(ralt_switch)"
+	include "kpdl(comma)"
+	key <AB01> { [              z,              Z,         zcaron,         Zcaron ] };
+	key <AB02> { [              x,              X,         zacute,         Zacute ] };
+	key <AB03> { [              c,              C,         cacute,         Cacute ] };
+	key <AB04> { [              v,              V,         ccaron,         Ccaron ] };
+	key <AB06> { [              n,              N,         nacute,         Nacute ] };
+	key <AC02> { [              s,              S,         sacute,         Sacute ] };
+	key <AC03> { [              d,              D,         scaron,         Scaron ] };
+	key <AC04> { [              f,              F                                 ] };
+	key <AD01> { [              q,              Q                                 ] };
+	key <AD02> { [              w,              W                                 ] };
+	key <AD03> { [              e,              E,         ecaron,         Ecaron ] };
+	key <AD04> { [              r,              R,         racute,         Racute ] };
+	key <AD05> { [              t,              T,          U20B5,       EuroSign ] };
+	key <AD09> { [              o,              O,         oacute,         Oacute ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "dsb_qwertz"
+{
+	name[Group1] = "Germany - Lower Sorbian (qwertz)";
+	include "latin(basic)"
+	include "level3(ralt_switch)"
+	include "kpdl(comma)"
+	key <AB01> { [              y,              Y                                 ] };
+	key <AB02> { [              x,              X                                 ] };
+	key <AB03> { [              c,              C,         cacute,         Cacute ] };
+	key <AB04> { [              v,              V,         ccaron,         Ccaron ] };
+	key <AB06> { [              n,              N,         nacute,         Nacute ] };
+	key <AC02> { [              s,              S,         sacute,         Sacute ] };
+	key <AC03> { [              d,              D,         scaron,         Scaron ] };
+	key <AC04> { [              f,              F                                 ] };
+	key <AD01> { [              q,              Q                                 ] };
+	key <AD02> { [              w,              W                                 ] };
+	key <AD03> { [              e,              E,         ecaron,         Ecaron ] };
+	key <AD04> { [              r,              R,         racute,         Racute ] };
+	key <AD05> { [              t,              T,          U20B5,       EuroSign ] };
+	key <AD06> { [              z,              Z,         zcaron,         Zcaron ] };
+	key <AD07> { [              u,              U,         zacute,         Zacute ] };
+	key <AD09> { [              o,              O,         oacute,         Oacute ] };
+};
+
+partial alphanumeric_keys 
+xkb_symbols "qwerty" {
+ 
+    // This layout should work exactly as a de with the exception 
+    // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped).
+    // 2008 by Matej Košík <kosik@fiit.stuba.sk>
+    
+    include "de(basic)"
+
+    name[Group1] = "Germany - qwerty";
+
+    key <AB01>	{ [         z,          Z,     leftarrow,         yen ]	};
+    key <AD06>	{ [         y,          Y, guillemotleft,        less ]	};
+};
diff --git a/xorg-server/xkbdata.src/symbols/digital_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/digital_vndr/Makefile.in
index 38a6a7ecb..6a4f87404 100644
--- a/xorg-server/xkbdata.src/symbols/digital_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/digital_vndr/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -57,8 +53,6 @@ DATA = $(dist_symbols_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -160,6 +131,7 @@ am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build_alias = @build_alias@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 xkb_base = @xkb_base@
 xkb_rules_symlink = @xkb_rules_symlink@
 symbolsdir = $(xkb_base)/symbols/digital_vndr
@@ -199,8 +175,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -224,10 +200,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
 install-dist_symbolsDATA: $(dist_symbols_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+	test -z "$(symbolsdir)" || $(MKDIR_P) "$(DESTDIR)$(symbolsdir)"
 	@list='$(dist_symbols_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -250,22 +225,21 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -281,7 +255,7 @@ check: check-am
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(symbolsdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -327,12 +301,20 @@ info-am:
 
 install-data-am: install-dist_symbolsDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -351,17 +333,21 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dist_symbolsDATA uninstall-info-am
+uninstall-am: uninstall-dist_symbolsDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-dist_symbolsDATA install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-dist_symbolsDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_symbolsDATA uninstall-info-am
+	uninstall-dist_symbolsDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/xkbdata.src/symbols/epo b/xorg-server/xkbdata.src/symbols/epo
index a1c9c6098..c9b2d57b2 100644
--- a/xorg-server/xkbdata.src/symbols/epo
+++ b/xorg-server/xkbdata.src/symbols/epo
@@ -113,3 +113,29 @@ xkb_symbols "legacy" {
 
   include "level3(ralt_switch)"
 };
+
+// Add Esperanto supersignos to the corresponding key in a Qwerty keyboard.
+// This is a generic "component" that is not used to the other layouts in this
+// file but it is meant to be applied to any layout. If you have any questions
+// ask J. Pablo Fernández <pupeno@pupeno.com>.
+partial
+xkb_symbols "qwerty" {
+    key <AB03> { [ NoSymbol, NoSymbol, ccircumflex, Ccircumflex ] };
+    key <AC05> { [ NoSymbol, NoSymbol, gcircumflex, Gcircumflex ] };
+    key <AC06> { [ NoSymbol, NoSymbol, hcircumflex, Hcircumflex ] };
+    key <AC07> { [ NoSymbol, NoSymbol, jcircumflex, Jcircumflex ] };
+    key <AC02> { [ NoSymbol, NoSymbol, scircumflex, Scircumflex ] };
+    key <AD07> { [ NoSymbol, NoSymbol,      ubreve,      Ubreve ] };
+};
+
+// Add Esperanto supersignos to the corresponding key in a Dvorak keyboard.
+// Same comment as the Qwerty one above applies.
+partial
+xkb_symbols "dvorak" {
+    key <AD08> { [ NoSymbol, NoSymbol, ccircumflex, Ccircumflex ] };
+    key <AD07> { [ NoSymbol, NoSymbol, gcircumflex, Gcircumflex ] };
+    key <AC07> { [ NoSymbol, NoSymbol, hcircumflex, Hcircumflex ] };
+    key <AB03> { [ NoSymbol, NoSymbol, jcircumflex, Jcircumflex ] };
+    key <AC10> { [ NoSymbol, NoSymbol, scircumflex, Scircumflex ] };
+    key <AC04> { [ NoSymbol, NoSymbol,      ubreve,      Ubreve ] };
+};
diff --git a/xorg-server/xkbdata.src/symbols/es b/xorg-server/xkbdata.src/symbols/es
index 404e6db61..96ccc6fed 100644
--- a/xorg-server/xkbdata.src/symbols/es
+++ b/xorg-server/xkbdata.src/symbols/es
@@ -193,3 +193,13 @@ xkb_symbols "olpc" {
 
     include "level3(ralt_switch)"
 };
+
+partial alphanumeric_keys
+xkb_symbols "deadtilde" {
+
+    include "es(basic)"
+
+    name[Group1]="Spain - Include dead tilde";
+
+    key <AE04>	{ [         4,     dollar,   dead_tilde,       dollar ]	};
+};
diff --git a/xorg-server/xkbdata.src/symbols/et b/xorg-server/xkbdata.src/symbols/et
index e6d1ba722..f3d4a98db 100644
--- a/xorg-server/xkbdata.src/symbols/et
+++ b/xorg-server/xkbdata.src/symbols/et
@@ -55,11 +55,11 @@ xkb_symbols "olpc" {
     key <AC09>	{ [        0x01001208,  VoidSymbol ]	}; // l
 
     key <AC10>	{ [        0x01001362,  0x01001361 ]	}; // :;
-    key <AC11>	{ [        apostrophe,  quotedbl   ]	}; // '"
+    key <AC11>  { [        0x01001366,  0x01001365 ]    }; // '"
 
     key <AB01>	{ [        0x010012D8,  0x010012E0 ]	}; // z
     key <AB02>	{ [        0x010012A0,  0x010012D0 ]	}; // x
-    key <AB03>	{ [        c,           C          ]	}; // c
+    key <AB03>  { [        0x01001278,  VoidSymbol ]    }; // c
     key <AB04>	{ [        0x01001238,  0x01001268 ]	}; // v
     key <AB05>	{ [        0x01001260,  VoidSymbol ]	}; // b
     key <AB06>	{ [        0x01001290,  0x01001298 ]	}; // n
@@ -67,9 +67,9 @@ xkb_symbols "olpc" {
 
     key <AB08>	{ [        0x01001363,  VoidSymbol ]	}; // <
     key <AB09>	{ [        0x01001364,  VoidSymbol ]	}; // >
-    key <AB10>  { [        VoidSymbol,  question   ]    }; // ?
+    key <AB10>  { [        0x01001367,  VoidSymbol ]    }; // ?
 
-    key <BKSL> {  [        backslash,   VoidSymbol ]    }; // bksl
+    key <BKSL> {  [        VoidSymbol,  0x01002010 ]    }; // bksl
 
     include "group(olpc)"
 };
diff --git a/xorg-server/xkbdata.src/symbols/fi b/xorg-server/xkbdata.src/symbols/fi
index 4fffb833d..ce9a3663f 100644
--- a/xorg-server/xkbdata.src/symbols/fi
+++ b/xorg-server/xkbdata.src/symbols/fi
@@ -4,11 +4,37 @@
 // $XFree86: xc/programs/xkbcomp/symbols/fi,v 1.9 2003/01/29 17:17:31 dawes Exp $
 
 // Troy Korjuslommi, 
-// Jan 6, 2006,
-// May 5, 2006.
-// May 6, 2006.
-// May 12, 2006.
-// Oct 10, 2007.
+// Jan  6, 2006
+// May  5, 2006
+// May  6, 2006
+// May 12, 2006
+// Oct 10, 2007
+// Nov 11, 2008
+// Nov 29, 2008
+// Dec 31, 2008
+// Jan 22, 2009
+//
+//
+// Jan 22, 2009
+// Submit requests to change all remaining Uxxxx values to named versions
+// in keysymdef.h.
+// ezh      : U0292: LATIN SMALL LETTER EZH
+// Ezh      : U01B7: LATIN CAPITAL LETTER EZH
+// permille : U2030: PER MILLE SIGN
+// 
+// Dec 31, 2008
+// U0326 replaced with dead_belowcomma.
+// 
+// Nov 29, 2008
+// dead_belowcomma has been added to keysymdef.h, so the U0326 can be replaced with
+// it, as long as the version of X11 is built with the new keysymdef.h file.
+// 
+// Nov 11, 2008.
+// (a) Changed <AC10> level 4 from Ooblique to Oslash. The two names are synonyms. Since level 3 is already
+//     specified as oslash, the change adds consistency.
+// (b) The new Finnish keyboard standard (SFS 5966) reserves <AB10> level 4 for U0326, the combining comma below. 
+//     Removed the previous dead_abovedot entry there and replaced it with U0326, which can be replaced
+//     with dead_commabelow if that is added to keysymdef.h.
 // 
 // Oct 10, 2007.
 // -Changed space column 3 to nobreakspace (from space).
@@ -56,8 +82,8 @@ xkb_symbols "kotoistus" {
     key <AE05> { [  5,               percent,          U2030,                leftdoublequotemark  ] };
     key <AE06> { [  6,               ampersand,        singlelowquotemark,   doublelowquotemark   ] };
     key <AE07> { [  7,               slash,            braceleft,            NoSymbol             ] };
-    key <AE08> { [  8,               parenleft,        bracketleft,          NoSymbol             ] };
-    key <AE09> { [  9,               parenright,       bracketright,         NoSymbol             ] };
+    key <AE08> { [  8,               parenleft,        bracketleft,          less                 ] };
+    key <AE09> { [  9,               parenright,       bracketright,         greater              ] };
     key <AE10> { [  0,               equal,            braceright,           degree               ] };
     key <AE11> { [  plus,            question,         backslash,            questiondown         ] };
     key <AE12> { [  dead_acute,      dead_grave,       dead_cedilla,         dead_ogonek          ] };
@@ -68,7 +94,7 @@ xkb_symbols "kotoistus" {
     key <AD05> { [  t,               T,                thorn,                THORN                ] };
     key <AD06> { [  y,               Y,                y,                    Y                    ] };
     key <AD07> { [  u,               U,                u,                    U                    ] };
-    key <AD08> { [  i,               I,                idotless,             NoSymbol             ] };
+    key <AD08> { [  i,               I,                idotless,             bar                  ] };
     key <AD09> { [  o,               O,                oe,                   OE                   ] };
     key <AD10> { [  p,               P,                dead_horn,            dead_hook            ] };
     key <AD11> { [  aring,           Aring,            dead_doubleacute,     dead_abovering       ] };
@@ -82,7 +108,7 @@ xkb_symbols "kotoistus" {
     key <AC07> { [  j,               J,                j,                    J                    ] };
     key <AC08> { [  k,               K,                kra,                  NoSymbol             ] };
     key <AC09> { [  l,               L,                dead_stroke,          NoSymbol             ] };
-    key <AC10> { [  odiaeresis,      Odiaeresis,       oslash,               Ooblique             ] };
+    key <AC10> { [  odiaeresis,      Odiaeresis,       oslash,               Oslash               ] };
     key <AC11> { [  adiaeresis,      Adiaeresis,       ae,                   AE                   ] };
     key <BKSL> { [  apostrophe,      asterisk,         dead_caron,           dead_breve           ] };
     key <LSGT> { [  less,            greater,          bar,                  NoSymbol             ] };
@@ -95,7 +121,7 @@ xkb_symbols "kotoistus" {
     key <AB07> { [  m,               M,                mu,                   emdash               ] };
     key <AB08> { [  comma,           semicolon,        rightsinglequotemark, leftsinglequotemark  ] };
     key <AB09> { [  period,          colon,            dead_belowdot,        dead_abovedot        ] };
-    key <AB10> { [  minus,           underscore,       endash,               dead_abovedot        ] };
+    key <AB10> { [  minus,           underscore,       endash,               dead_belowcomma      ] };
 
     include "nbsp(level3)"
 
diff --git a/xorg-server/xkbdata.src/symbols/fr b/xorg-server/xkbdata.src/symbols/fr
index bdbce1baf..0d621a802 100644
--- a/xorg-server/xkbdata.src/symbols/fr
+++ b/xorg-server/xkbdata.src/symbols/fr
@@ -388,7 +388,7 @@ xkb_symbols "latin9" {
 
     // French uses a comma as decimal separator, but keyboards are labeled with a period
     // Will take effect when KP_Decimal is mapped to the locale decimal separator
-    key <KPDL>  { [       KP_Delete,          period,           KP_Delete,           KP_Decimal ] };
+    key <KPDL>  { [       KP_Delete,      KP_Decimal,           KP_Delete,           KP_Decimal ] };
 
     include "level3(ralt_switch)"
 };
@@ -430,98 +430,98 @@ xkb_symbols "latin9_nodeadkeys" {
 };
 
 // Bépo : Improved ergonomic french keymap using Dvorak method.
-// Built by community on 'Dvorak Fr' mailing list :
-// dvorak-fr@gpl.insa-lyon.fr and on its wiki : http://gpl.insa-lyon.fr/Dvorak-Fr/ .
-// XOrg integration in 2006 by Frédéric Boiteux <fboiteux @ free.fr>
+// Built by community on 'Dvorak Fr / Bépo' :
+// see http://www.clavier-dvorak.org/wiki/ to join and help.
+// XOrg integration (1.0rc2 version) in 2008
+// by Frédéric Boiteux <fboiteux at free dot fr>
 //
-// Bépo layout (6.2.1.1 version) for a pc105 keyboard (french) :
+// Bépo layout (1.0rc2 version) for a pc105 keyboard (french) :
 // ┌────┐
 // │ S A│   S = Shift,  A = AltGr + Shift
 // │ s a│   s = normal, a = AltGr
 // └────┘
 //
 // ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
-// │ $   │ 1 ¹ │ 2 ² │ 3 ³ │ 4 ° │ 5 ˚ │ 6   │ 7   │ 8   │ 9   │ 0   │ ^   │ µ   ┃ ⌫ Retour┃
-// │ @ # │ _ { │ " } │ « < │ » > │ ( [ │ ) ] │ + ± │ - ¬ │ * × │ / ÷ │ = ¯ │ %   ┃  arrière┃
+// │ # ¶ │ 1 „ │ 2 “ │ 3 ” │ 4 ≤ │ 5 ≥ │ 6   │ 7 ¬ │ 8 ¼ │ 9 ½ │ 0 ¾ │ ° ′ │ ` ″ ┃ ⌫ Retour┃
+// │ $ – │ " — │ « < │ » > │ ( [ │ ) ] │ @ ^ │ + ± │ - − │ / ÷ │ * × │ = ≠ │ % ‰ ┃  arrière┃
 // ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
-// ┃       ┃ B   │ É ˊ │ P ¶ │ O Œ │ È ` │ Ç   │ V   │ D Ð │ L   │ F   │ J   │ Z   ┃Entrée ┃
-// ┃Tab ↹  ┃ b | │ é & │ p § │ o œ │ è ` │ ç   │ v   │ d ð │ l £ │ f ª │ j   │ z   ┃   ⏎   ┃
+// ┃       ┃ B ¦ │ É ˝ │ P § │ O Œ │ È ` │ !   │ V   │ D Ð │ L   │ J IJ │ Z Ə │ W   ┃Entrée ┃
+// ┃Tab ↹  ┃ b | │ é ˊ │ p & │ o œ │ è ` │ ˆ ¡ │ v ˇ │ d ð │ l / │ j ij │ z ə │ w ̆ ┃   ⏎   ┃
 // ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓      ┃
-// ┃        ┃ A Æ │ U Ù │ I ˇ │ E   │ ?   │ C ¢ │ T Þ │ S   │ N   │ R   │ M   │ !   ┃      ┃
-// ┃Maj ⇬   ┃ a æ │ u ù │ i ̈ │ e € │ , ¿ │ c © │ t þ │ s ß │ n   │ r ® │ m º │ ˆ ¡ ┃      ┃
+// ┃        ┃ A Æ │ U Ù │ I ˙ │ E ¤ │ ; ̛ │ C ſ │ T Þ │ S ẞ │ R ™ │ N   │ M º │ Ç , ┃      ┃
+// ┃Maj ⇬   ┃ a æ │ u ù │ i ̈ │ e € │ , ’ │ c © │ t þ │ s ß │ r ® │ n ˜ │ m ¯ │ ç ¸ ┃      ┃
 // ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫
-// ┃       ┃ ù   │ À ˜ │ H   │ Y   │ : · │ K   │ ;   │ Q   │ G   │ X   │ W   ┃             ┃
-// ┃Shift ⇧┃ ê / │ à ~ │ h ! │ y ¥ │ . \ │ k   │ '   │ q   │ g   │ x   │ w   ┃Shift ⇧      ┃
+// ┃       ┃ Ê   │ À   │ Y ‘ │ X ’ │ : · │ K   │ ? ̉ │ Q ̣ │ G   │ H ‡ │ F ª ┃             ┃
+// ┃Shift ⇧┃ ê / │ à \ │ y { │ x } │ . … │ k ~ │ ' ¿ │ q ˚ │ g µ │ h † │ f ˛ ┃Shift ⇧      ┃
 // ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛
-// ┃       ┃       ┃       ┃ ⍽ Espace insécable              ␣ ┃       ┃       ┃       ┃
-// ┃Ctrl   ┃Meta   ┃Alt    ┃ ␣ Espace                        ␣ ┃AltGr ⇮┃Menu   ┃Ctrl   ┃
+// ┃       ┃       ┃       ┃ Espace inséc.   Espace inséc. fin ┃       ┃       ┃       ┃
+// ┃Ctrl   ┃Meta   ┃Alt    ┃ ␣ (Espace)      _               ␣ ┃AltGr ⇮┃Menu   ┃Ctrl   ┃
 // ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
 partial alphanumeric_keys
 xkb_symbols "bepo" {
 
+    include "level3(ralt_switch)"
     include "keypad(oss)"
 
     name[Group1]= "France - Bepo, ergonomic, Dvorak way";
 
     // First row
-    key <TLDE> { [              at,       dollar,     numbersign                 ] }; // @ $ #
-    key <AE01> { [      underscore,            1,      braceleft,    onesuperior ] }; // _ 1 { ¹
-    key <AE02> { [        quotedbl,            2,     braceright,    twosuperior ] }; // " 2 } ²
-    key <AE03> { [   guillemotleft,            3,           less,  threesuperior ] }; // « 3 < ³
-    key <AE04> { [  guillemotright,            4,        greater,         degree ] }; // » 4 > °
-    key <AE05> { [       parenleft,            5,    bracketleft, dead_abovering ] }; // ( 5 [ ˚
-    key <AE06> { [      parenright,            6,   bracketright                 ] }; // ) 6 ]
-    key <AE07> { [            plus,            7,      plusminus                 ] }; // + 7 ±
-    key <AE08> { [           minus,            8,        notsign                 ] }; // - 8 ¬
-    key <AE09> { [        asterisk,            9,       multiply                 ] }; // * 9 ×
-    key <AE10> { [           slash,            0,       division                 ] }; // / 0 ÷
-    key <AE11> { [           equal,  asciicircum,         macron                 ] }; // = ^ ¯
-    key <AE12> { [         percent,           mu                                 ] }; // % µ
+    key <TLDE> { [          dollar,   numbersign,        endash,       paragraph ] }; // $ # – ¶
+    key <AE01> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [        quotedbl,            1,         emdash, doublelowquotemark ] }; // " 1 — „
+    key <AE02> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [   guillemotleft,            2,           less,  leftdoublequotemark ] }; // « 2 < “
+    key <AE03> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [  guillemotright,            3,        greater, rightdoublequotemark ] }; // » 3 > ”
+    key <AE04> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [       parenleft,            4,    bracketleft,      lessthanequal ] }; // ( 4 [ ≤
+    key <AE05> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [      parenright,            5,   bracketright,   greaterthanequal ] }; // ) 5 ] ≥
+    key <AE06> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [              at,            6,    asciicircum                 ] }; // @ 6 ^
+    key <AE07> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [            plus,            7,      plusminus,        notsign ] }; // + 7 ± ¬
+    key <AE08> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [           minus,            8,          U2212,     onequarter ] }; // - 8 − ¼
+    key <AE09> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [           slash,            9,       division,        onehalf ] }; // / 9 ÷ ½
+    key <AE10> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [        asterisk,            0,       multiply,  threequarters ] }; // * 0 × ¾
+    key <AE11> { [           equal,       degree,       notequal,        minutes ] }; // = ° ≠ ′
+    key <AE12> { [         percent,        grave,          U2030,        seconds ] }; // % ` ‰ ″
 
     // Second row
-    key <AD01> { [               b,            B,            bar                 ] }; // b B |
-    key <AD02> { [          eacute,       Eacute,      ampersand,     dead_acute ] }; // é É & ˊ
-    key <AD03> { [               p,            P,        section,      paragraph ] }; // p P § ¶
+    key <AD01> { [               b,            B,            bar,      brokenbar ] }; // b B | ¦
+    key <AD02> { [          eacute,       Eacute,     dead_acute, dead_doubleacute ] }; // é É ˊ ˝
+    key <AD03> { [               p,            P,      ampersand,        section ] }; // p P & §
     key <AD04> { [               o,            O,             oe,             OE ] }; // o O œ Œ
-    key <AD05> { [          egrave,       Egrave,          grave,     dead_grave ] }; // è È ` `
-    key <AD06> { [        ccedilla,     Ccedilla                                 ] }; // ç Ç
-    key <AD07> { [               v,            V                                 ] }; // v V
+    key <AD05> { [          egrave,       Egrave,     dead_grave,          grave ] }; // è È ` `
+    key <AD06> { [ dead_circumflex,       exclam,     exclamdown                 ] }; // ^ ! ¡
+    key <AD07> { [               v,            V,     dead_caron                 ] }; // v V ˇ
     key <AD08> { [               d,            D,            eth,            ETH ] }; // d D ð Ð
-    key <AD09> { [               l,            L,       sterling                 ] }; // l L £
-    key <AD10> { [               f,            F,    ordfeminine                 ] }; // f F ª
-    key <AD11> { [               j,            J                                 ] }; // j J
-    key <AD12> { [               z,            Z                                 ] }; // z Z
+    key <AD09> { [               l,            L,    dead_stroke                 ] }; // l L /
+    key <AD10> { [               j,            J,          U0133,          U0132 ] }; // j J ij IJ
+    key <AD11> { [               z,            Z,          schwa,          SCHWA ] }; // z Z ə Ə
+    key <AD12> { [               w,            W,     dead_breve                 ] }; // w W ̆
 
     // Third row
     key <AC01> { [               a,            A,             ae,             AE ] }; // a A æ Æ
     key <AC02> { [               u,            U,         ugrave,         Ugrave ] }; // u U ù Ù
-    key <AC03> { [               i,            I, dead_diaeresis,     dead_caron ] }; // i I ̈ ˇ
-    key <AC04> { [               e,            E,       EuroSign                 ] }; // e E €
-    key <AC05> { [           comma,     question,   questiondown                 ] }; // , ? ¿
-    key <AC06> { [               c,            C,      copyright,           cent ] }; // c C © ¢
-    key <AC07> { [               t,            T,          thorn,          Thorn ] }; // t T þ Þ
-    key <AC08> { [               s,            S,         ssharp                 ] }; // s S ß
-    key <AC09> { [               n,            N                                 ] }; // n N
-    key <AC10> { [               r,            R,     registered                 ] }; // r R ®
-    key <AC11> { [               m,            M,      masculine                 ] }; // m M º
-    key <BKSL> { [ dead_circumflex,       exclam,     exclamdown                 ] }; // ^ ! ¡
+    key <AC03> { [               i,            I, dead_diaeresis,  dead_abovedot ] }; // i I ̈ ˙
+    key <AC04> { [               e,            E,       EuroSign,  dead_currency ] }; // e E € ¤
+    key <AC05> { [           comma,    semicolon, rightsinglequotemark, dead_horn ] }; // , ; ’ ̛
+    key <AC06> { [               c,            C,      copyright,          U017F ] }; // c C © ſ
+    key <AC07> { [               t,            T,          thorn,          THORN ] }; // t T þ Þ
+    key <AC08> { [               s,            S,         ssharp,          U1E9E ] }; // s S ß ẞ
+    key <AC09> { [               r,            R,     registered,      trademark ] }; // r R ® ™
+    key <AC10> { [               n,            N,     dead_tilde                 ] }; // n N ~
+    key <AC11> { [               m,            M,    dead_macron,      masculine ] }; // m M ̄ º
+    key <BKSL> { [        ccedilla,     Ccedilla,   dead_cedilla, dead_belowcomma ] }; // ç Ç ¸ ,
 
     // Fourth row
-    key <LSGT> { [     ecircumflex,       ugrave,          slash                 ] }; // ê ù /
-    key <AB01> { [          agrave,       Agrave,     asciitilde,     dead_tilde ] }; // à À ~ ~
-    key <AB02> { [               h,            H,         exclam                 ] }; // h H !
-    key <AB03> { [               y,            Y,            yen                 ] }; // y Y ¥
-    key <AB04> { [          period,        colon,      backslash, periodcentered ] }; // . : \ ·
-    key <AB05> { [               k,            K                                 ] }; // k K
-    key <AB06> { [      apostrophe,    semicolon                                 ] }; // ' ;
-    key <AB07> { [               q,            Q,         oslash,       Ooblique ] }; // q Q ø Ø
-    key <AB08> { [               g,            G                                 ] }; // g G
-    key <AB09> { [               x,            X                                 ] }; // x X
-    key <AB10> { [               w,            W                                 ] }; // w W
-
-    key <SPCE> { [           space, nobreakspace,          space,          space ] }; // ␣ ⍽ (espace insécable) ␣ ␣
-
-    include "level3(ralt_switch)"
+    key <LSGT> { [     ecircumflex,  Ecircumflex,          slash                 ] }; // ê Ê /
+    key <AB01> { [          agrave,       Agrave,      backslash                 ] }; // à À \
+    key <AB02> { [               y,            Y,      braceleft, leftsinglequotemark  ] }; // y Y { ‘
+    key <AB03> { [               x,            X,     braceright, rightsinglequotemark ] }; // x X } ’
+    key <AB04> { [          period,        colon,       ellipsis, periodcentered ] }; // . : … ·
+    key <AB05> { [               k,            K,     asciitilde                 ] }; // k K ~
+    key <AB06> { [      apostrophe,     question,   questiondown,      dead_hook ] }; // ' ? ¿ ̉
+    key <AB07> { [               q,            Q, dead_abovering,  dead_belowdot ] }; // q Q ˚ ̣
+    key <AB08> { [               g,            G,             mu                 ] }; // g G µ
+    key <AB09> { [               h,            H,         dagger,   doubledagger ] }; // h H † ‡
+    key <AB10> { [               f,            F,    dead_ogonek,    ordfeminine ] }; // f F ̨ ª
+
+    key <SPCE> { [           space, nobreakspace,     underscore,          U202F ] }; // ␣ (espace insécable) _ (espace insécable fin)
 };
 
 partial alphanumeric_keys
@@ -529,12 +529,44 @@ xkb_symbols "bepo_latin9" {
 
     // Restricts the fr(bepo) layout to latin9 symbols
 
-    include "keypad(oss_latin9)"
     include "fr(bepo)"
+    include "keypad(oss_latin9)"
 
     name[Group1]="France - Bepo, ergonomic, Dvorak way, latin-9 only";
 
-    // at now, no difference (oss keypad excepted), but will change !
+    key <TLDE> { [          dollar,   numbersign,        dollar,       paragraph ] }; // $ # $ ¶
+
+    key <AE01> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [        quotedbl,            1                                 ] }; // " 1
+    key <AE02> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [   guillemotleft,            2,           less                 ] }; // « 2 <
+    key <AE03> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [  guillemotright,            3,        greater                 ] }; // » 3 >
+    key <AE04> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [       parenleft,            4,    bracketleft                 ] }; // ( 4 [
+    key <AE05> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [      parenright,            5,   bracketright                 ] }; // ) 5 ]
+    key <AE08> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [           minus,            8,          minus,     onequarter ] }; // - 8 - ¼
+    key <AE11> { [           equal,       degree                                 ] }; // = °
+    key <AE12> { [         percent,        grave                                 ] }; // % `
+
+    key <AD01> { [               b,            B,            bar                 ] }; // b B |
+    key <AD02> { [          eacute,       Eacute,     dead_acute                 ] }; // é É ˊ
+    key <AD10> { [               j,            J                                 ] }; // j J
+    key <AD11> { [               z,            Z                                 ] }; // z Z
+    key <AD12> { [               w,            W                                 ] }; // w W
+
+    key <AC03> { [               i,            I, dead_diaeresis                 ] }; // i I ̈
+    key <AC05> { [           comma,    semicolon,          comma,      dead_horn ] }; // , ; , ̛
+    key <AC06> { [               c,            C,      copyright                 ] }; // c C ©
+    key <AC08> { [               s,            S,         ssharp                 ] }; // s S ß
+    key <AC09> { [               r,            R,     registered                 ] }; // r R ®
+    key <AC11> { [               m,            M,         macron,      masculine ] }; // m M ̄ º
+
+    key <AB02> { [               y,            Y,      braceleft                 ] }; // y Y {
+    key <AB03> { [               x,            X,     braceright                 ] }; // x X }
+    key <AB04> { [          period,        colon                                 ] }; // . :
+    key <AB09> { [               h,            H                                 ] }; // h H
+    key <AB10> { [               f,            F,              f,    ordfeminine ] }; // f F   ª
+
+    // Note : on a besoin de redéfinir les niveaux 3 et 4,
+    // donc nbsp(level2) ne suffit pas !
+    key <SPCE> { [           space,  nobreakspace,    underscore,   nobreakspace ] }; // ␣ (espace insécable) _ (espace insécable)
 };
 
 // Author   : Francis Leboutte, http://www.algo.be/ergo/dvorak-fr.html
@@ -641,6 +673,193 @@ xkb_symbols "dvorak" {
   key <SPCE> { [            space,            space,    nobreakspace,     nobreakspace ] };
 };
 
+// C'WHERTY: Breton keyboard. Ar c'hlavier brezhoneg.
+// Copyright © 2009 Dominique Pellé <dominique.pelle@gmail.com>
+// Version: 0.1
+//
+// ┌────┐
+// │ S A│   S = Reol = Shift,  A = ArErl + Pennlizherenn = AltGr + Shift
+// │ s a│   s = normal,        a = AltGr
+// └────┘
+//
+// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
+// │ $ Γ │ 1 Δ │ 2 Θ │ 3 Λ │ 4 Ξ │ 5 Π │ 6 Σ │ 7 Φ │ 8 Ψ │ 9 Ç │ 0 Ω │ ° ß │ + ¬ ┃ ⌫ Souzañ┃
+// │ ² ˙ │ & ¯ │ é ´ │ " # │ ' { │ ( [ │ - | │ è ` │ - \ │ ç ± │ à @ │ ) ] │ = } ┃         ┃
+// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
+// ┃Toalenn┃ C'h │ W ω │ E ε │ R ρ │ T τ │ Y ψ │ U υ │ I ι │ O OE│ P π │ ¨ ¥ │ * £ ┃Enankañ┃
+// ┃     ↹ ┃ c'h │ w   │ e € │ r   │ t   │ y   │ u   │ i ı │ o oe│ p   │ ^ « │ / » ┃   ⏎   ┃
+// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓      ┃
+// ┃Prenn   ┃ A Æ │ S σ │ D δ │ F φ │ G γ │ H η │ J ς │ K κ │ L λ │ M μ │ Ù ® │ ! ¡ ┃      ┃
+// ┃Pennli ⇬┃ a æ │ s   │ d $ │ f   │ g   │ h   │ j   │ k   │ l   │ m   │ ù ŭ │ ? ¿ ┃      ┃
+// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫
+// ┃       ┃ Q θ │ Z ζ │ X ξ │ C χ │ V   │ B β │ N ν │ CH  │ Ñ   │ : © │ ;   ┃             ┃
+// ┃Shift ⇧┃ q < │ z > │ x   │ c ¢ │ v   │ b   │ n   │ ch  │ ñ   │ .   │ ,   ┃Shift ⇧      ┃
+// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛
+// ┃       ┃       ┃       ┃ ⍽ Espace insécable              ␣ ┃       ┃       ┃       ┃
+// ┃Reol   ┃Meta   ┃Erl    ┃ ␣ Espace                        ␣ ┃ArErl ⇮┃Menu   ┃Reol   ┃
+// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
+partial alphanumeric_keys
+xkb_symbols "bre" {
+
+    include "keypad(oss)"
+
+    name[Group1]= "France - Breton";
+
+    // First row
+    key <TLDE> { [     twosuperior,     dead_tilde,   dead_abovedot,    Greek_GAMMA ] };
+    key <AE01> { [       ampersand,              1,     dead_macron,    Greek_DELTA ] };
+    key <AE02> { [          eacute,              2,      dead_acute,    Greek_THETA ] };
+    key <AE03> { [        quotedbl,              3,      numbersign,    Greek_LAMDA ] };
+    key <AE04> { [      apostrophe,              4,       braceleft,       Greek_XI ] };
+    key <AE05> { [       parenleft,              5,     bracketleft,       Greek_PI ] };
+    key <AE06> { [           minus,              6,             bar,    Greek_SIGMA ] };
+    key <AE07> { [          egrave,              7,      dead_grave,      Greek_PHI ] };
+    key <AE08> { [      underscore,              8,       backslash,      Greek_PSI ] };
+    key <AE09> { [        ccedilla,              9,       plusminus,       Ccedilla ] };
+    key <AE10> { [          agrave,              0,              at,    Greek_OMEGA ] };
+    key <AE11> { [      parenright, dead_abovering,    bracketright,         ssharp ] };
+    key <AE12> { [           equal,           plus,      braceright,        notsign ] };
+
+    // Second row
+    // Handling the C'H key correctly requires an inputmethod (XIM)
+    // See https://bugs.freedesktop.org/show_bug.cgi?id=19506
+ // key <AD01> { [    trigraph_c_h,   trigraph_C_h,    trigraph_C_H,    Greek_alpha ] };
+    key <AD01> { [           UF8FD,          UF8FE,           UF8FF,    Greek_alpha ] };
+    key <AD02> { [               w,              W,     Greek_omega,    Greek_omega ] };
+    key <AD03> { [               e,              E,        EuroSign,  Greek_epsilon ] };
+    key <AD04> { [               r,              R,       Greek_rho,      Greek_rho ] };
+    key <AD05> { [               t,              T,       Greek_tau,      Greek_tau ] };
+    key <AD06> { [               y,              Y,       Greek_psi,      Greek_psi ] };
+    key <AD07> { [               u,              U,   Greek_upsilon,  Greek_upsilon ] };
+    key <AD08> { [               i,              I,        idotless,     Greek_iota ] };
+    key <AD09> { [               o,              O,              oe,             OE ] };
+    key <AD10> { [               p,              P,        Greek_pi,       Greek_pi ] };
+    key <AD11> { [ dead_circumflex, dead_diaeresis,   guillemotleft,            yen ] };
+    key <AD12> { [           slash,       asterisk,  guillemotright,       sterling ] };
+
+    // Third row
+    key <AC01> { [               a,              A,              ae,             AE ] };
+    key <AC02> { [               s,              S,     Greek_sigma,    Greek_sigma ] };
+    key <AC03> { [               d,              D,          dollar,    Greek_delta ] };
+    key <AC04> { [               f,              F,       Greek_phi,      Greek_phi ] };
+    key <AC05> { [               g,              G,     Greek_gamma,    Greek_gamma ] };
+    key <AC06> { [               h,              H,       Greek_eta,      Greek_eta ] };
+    key <AC07> { [               j,              J, Greek_finalsmallsigma, Greek_finalsmallsigma ] };
+    key <AC08> { [               k,              K,       Greek_kappa,  Greek_kappa ] };
+    key <AC09> { [               l,              L,       Greek_lamda, Greek_lambda ] };
+    key <AC10> { [               m,              M,          Greek_mu,     Greek_mu ] };
+    key <AC11> { [          ugrave,         Ugrave,            ubreve,   registered ] };
+    key <BKSL> { [        question,         exclam,      questiondown,   exclamdown ] };
+
+    // Fourth row
+    key <LSGT> { [               q,              Q,            less,    Greek_theta ] };
+    key <AB01> { [               z,              Z,         greater,     Greek_zeta ] };
+    key <AB02> { [               x,              X,        Greek_xi,       Greek_xi ] };
+    key <AB03> { [               c,              C,            cent,      Greek_chi ] };
+    key <AB04> { [               v,              V                                  ] };
+    key <AB05> { [               b,              B,      Greek_beta,     Greek_beta ] };
+    key <AB06> { [               n,              N,        Greek_nu,       Greek_nu ] };
+    // Handling the CH key correctly requires an inputmethod (XIM)
+    // See https://bugs.freedesktop.org/show_bug.cgi?id=19506
+ // key <AB07> { [      digraph_ch,     digraph_Ch,      digraph_CH,  Greek_omicron ] };
+    key <AB07> { [           UF8FA,          UF8FB,           UF8FC,  Greek_omicron ] };
+    key <AB08> { [          ntilde,         Ntilde                                  ] };
+    key <AB09> { [          period,          colon,         section,      copyright ] };
+    key <AB10> { [           comma,      semicolon,         percent                 ] };
+
+    key <SPCE> { [           space,   nobreakspace,           space,   nobreakspace ] };
+
+    include "level3(ralt_switch)"
+};
+
+// Occitan layout
+// Author : 2009 Thomas Metz <tmetz @ free.fr>
+// Derivated from the layout defined at http://www.panoccitan.org
+// Version: 0.1
+// From OSS french keyboard :
+// - add á, í, ò, ó et ú, Á, Í, Ò, Ó, Ú, ñ, Ñ
+// - change position of æ, ü, î, û, œ, ô, ö, ï, â, ë
+// 
+// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
+// │ ³ ¸ │ 1 ̨ │ 2 É │ 3 ˘ │ 4 — │ 5 – │ 6 ‑ │ 7 È │ 8 ™ │ 9 Ç │ 0 À │ ° ≠ │ + ± ┃ ⌫ Retour┃
+// │ ² ¹ │ & ˇ │ é ~ │ " # │ ' { │ ( [ │ - | │ è ` │ _ \ │ ç ^ │ à @ │ ) ] │ = } ┃  arrière┃
+// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
+// ┃       ┃ A Á │ Z Æ │ E ¢ │ R Ê │ T Ë │ Y Û │ U Ú │ I Í │ O Ó │ P Ò │ ¨ Œ │ £ Ø ┃Entrée ┃
+// ┃Tab ↹  ┃ a á │ z æ │ e € │ r ê │ t ë │ y û │ u ú │ i í │ o ó │ p ò │ ^ œ │ $ ø ┃   ⏎   ┃
+// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓      ┃
+// ┃        ┃ Q Ä │ S „ │ D Â │ F ‚ │ G ¥ │ H Ü │ J Î │ K Ï │ L Ô │ M Ö │ % Ù │ µ ̄ ┃      ┃
+// ┃Maj ⇬   ┃ q ä │ s ß │ d â │ f ‘ │ g ’ │ h ü │ j î │ k ï │ l ô │ m ö │ ù ' │ * ` ┃      ┃
+// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫
+// ┃       ┃ > ≥ │ W “ │ X ” │ C ® │ V ← │ B ↑ │ N Ñ │ ? … │ . . │ / ∕ │ § − ┃             ┃
+// ┃Shift ⇧┃ < ≤ │ w « │ x » │ c © │ v → │ b ↓ │ n ñ │ , ¿ │ ; × │ : ÷ │ ! ¡ ┃Shift ⇧      ┃
+// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛
+// ┃       ┃       ┃       ┃ ␣         Espace fine insécable ⍽ ┃       ┃       ┃       ┃
+// ┃Ctrl   ┃Meta   ┃Alt    ┃ ␣ Espace       Espace insécable ⍽ ┃AltGr ⇮┃Menu   ┃Ctrl   ┃
+// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
+partial alphanumeric_keys
+xkb_symbols "oci" {
+
+    include "keypad(oss)"
+
+    name[Group1]= "France - Occitan";
+
+    // First row
+    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,          dead_cedilla ] }; // ² ³ ¹ ¸ 
+    key <AE01>	{ [        ampersand,                1,           dead_caron,           dead_ogonek ] }; // & 1 ˇ ̨
+    key <AE02>	{ [           eacute,                2,           asciitilde,                Eacute ] }; // é 2 ~ É
+    key <AE03>	{ [         quotedbl,                3,           numbersign,            dead_breve ] }; // " 3 # ˘
+    key <AE04>	{ [       apostrophe,                4,            braceleft,             0x1002014 ] }; // ' 4 { — (tiret cadratin)
+    key <AE05>	{ [        parenleft,                5,          bracketleft,             0x1002013 ] }; // ( 5 [ – (tiret demi-cadratin)
+    key <AE06>	{ [            minus,                6,                  bar,             0x1002011 ] }; // - 6 | ‑ (tiret insécable)
+    key <AE07>	{ [           egrave,                7,                grave,                Egrave ] }; // è 7 ` È
+    key <AE08>	{ [       underscore,                8,            backslash,             trademark ] }; // _ 8 \ ™
+    key <AE09>	{ [         ccedilla,                9,          asciicircum,              Ccedilla ] }; // ç 9 ^ Ç
+    key <AE10>	{ [           agrave,                0,                   at,                Agrave ] }; // à 0 @ À
+    key <AE11>	{ [       parenright,           degree,         bracketright,              notequal ] }; // ) ° ] ≠ 
+    key <AE12>	{ [            equal,             plus,           braceright,             plusminus ] }; // = + } ±
+
+    // Second row
+    key <AD01>	{ [                a,                A,               aacute,                Aacute ] }; // a A á Á
+    key <AD02>	{ [                z,                Z,                   ae,                    AE ] }; // z Z æ Æ
+    key <AD03>	{ [                e,                E,             EuroSign,                  cent ] }; // e E € ¢
+    key <AD04>	{ [                r,                R,          ecircumflex,           Ecircumflex ] }; // r R ê Ê
+    key <AD05>	{ [                t,                T,           ediaeresis,            Ediaeresis ] }; // t T ë Ë
+    key <AD06>	{ [                y,                Y,          ucircumflex,           Ucircumflex ] }; // y Y û Û
+    key <AD07>	{ [                u,                U,               uacute,                Uacute ] }; // u U ú Ú
+    key <AD08>	{ [                i,                I,               iacute,                Iacute ] }; // i I í Í
+    key <AD09>	{ [                o,                O,               oacute,                Oacute ] }; // o O ó Ó
+    key <AD10>	{ [                p,                P,               ograve,                Ograve ] }; // p P ò Ò
+    key <AD11>	{ [  dead_circumflex,   dead_diaeresis,                   oe,                    OE ] }; // ^ ̈ ̃ œ Œ
+    key <AD12>	{ [           dollar,         sterling,               oslash,              Ooblique ] }; // $ £ ø Ø
+
+    // Third row
+    key <AC01>	{ [                q,                Q,           adiaeresis,            Adiaeresis ] }; // q Q ä Ä
+    key <AC02>	{ [                s,                S,               ssharp,    doublelowquotemark ] }; // s S ß „ 
+    key <AC03>	{ [                d,                D,           acircumflex,          Acircumflex ] }; // d D â Â
+    key <AC04>	{ [                f,                F,  leftsinglequotemark,    singlelowquotemark ] }; // f F ‘ ‚
+    key <AC05>	{ [                g,                G, rightsinglequotemark,                   yen ] }; // g G ’ ¥
+    key <AC06>	{ [                h,                H,           udiaeresis,            Udiaeresis ] }; // h H ü Ü
+    key <AC07>	{ [                j,                J,          icircumflex,            Icircumflex] }; // j J î Î
+    key <AC08>	{ [                k,                K,           idiaeresis,             Idiaeresis] }; // k K ï Ï
+    key <AC09>	{ [                l,                L,          ocircumflex,           Ocircumflex ] }; // l L ô Ô
+    key <AC10>	{ [                m,                M,           odiaeresis,            Odiaeresis ] }; // m M ö Ö
+    key <AC11>	{ [           ugrave,          percent,           dead_acute,                Ugrave ] }; // ù % ' Ù
+    key <BKSL>	{ [         asterisk,               mu,           dead_grave,           dead_macron ] }; // * µ ` ̄
+
+    // Fourth row
+    key <LSGT>  { [             less,          greater,        lessthanequal,      greaterthanequal ] }; // < > ≤ ≥
+    key <AB01>  { [                w,                W,        guillemotleft,   leftdoublequotemark ] }; // w W « “
+    key <AB02>  { [                x,                X,       guillemotright,  rightdoublequotemark ] }; // x X » ”
+    key <AB03>  { [                c,                C,            copyright,            registered ] }; // c C © ®
+    key <AB04>  { [                v,                V,            rightarrow,            leftarrow ] }; // v V → ← 
+    key <AB05>  { [                b,                B,            downarrow,               uparrow ] }; // b B ↓ ↑
+    key <AB06>  { [                n,                N,              ntilde,                 Ntilde ] }; // n N ñ Ñ
+    key <AB07>  { [            comma,         question,         questiondown,             0x1002026 ] }; // , ? ¿ …
+    key <AB08>  { [        semicolon,           period,             multiply,             0x10022C5 ] }; // ; . × ⋅
+    key <AB09>  { [            colon,            slash,             division,             0x1002215 ] }; // : / ÷ ∕
+    key <AB10>  { [           exclam,          section,           exclamdown,             0x1002212 ] }; // ! § ¡ −
+};
+
 // Marc.Shapiro@inria.fr 19-sep-1998
 // modifications : Etienne Herlent <eherlent@linux-france.org> june 2000
 // adapted to the new input layer :
diff --git a/xorg-server/xkbdata.src/symbols/fujitsu_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/fujitsu_vndr/Makefile.in
index 3c7824624..2680b63b6 100644
--- a/xorg-server/xkbdata.src/symbols/fujitsu_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/fujitsu_vndr/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -57,8 +53,6 @@ DATA = $(dist_symbols_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -160,6 +131,7 @@ am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build_alias = @build_alias@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 xkb_base = @xkb_base@
 xkb_rules_symlink = @xkb_rules_symlink@
 symbolsdir = $(xkb_base)/symbols/fujitsu_vndr
@@ -198,8 +174,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -223,10 +199,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
 install-dist_symbolsDATA: $(dist_symbols_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+	test -z "$(symbolsdir)" || $(MKDIR_P) "$(DESTDIR)$(symbolsdir)"
 	@list='$(dist_symbols_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -249,22 +224,21 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -280,7 +254,7 @@ check: check-am
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(symbolsdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -326,12 +300,20 @@ info-am:
 
 install-data-am: install-dist_symbolsDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -350,17 +332,21 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dist_symbolsDATA uninstall-info-am
+uninstall-am: uninstall-dist_symbolsDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-dist_symbolsDATA install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-dist_symbolsDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_symbolsDATA uninstall-info-am
+	uninstall-dist_symbolsDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/xkbdata.src/symbols/gb b/xorg-server/xkbdata.src/symbols/gb
index a2a048ef4..bfb54820c 100644
--- a/xorg-server/xkbdata.src/symbols/gb
+++ b/xorg-server/xkbdata.src/symbols/gb
@@ -61,6 +61,50 @@ xkb_symbols "intl" {
     include "level3(ralt_switch)"
 };
 
+partial alphanumeric_keys 
+xkb_symbols "extd" {
+    // Clone of the Microsoft "United Kingdom - Extended" layout, which
+    // includes dead keys for: grave; diaeresis; circumflex; tilde; and
+    // accute. It also enables direct access to accute characters using
+    // the Multi_key (Alt Gr).
+    //
+    // Taken from...
+    //    "Windows Keyboard Layouts"
+    //    http://msdn.microsoft.com/en-us/goglobal/bb964651.aspx
+    //
+    // -- Jonathan Miles <jon@cybah.co.uk>
+
+    include "latin"
+
+    name[Group1]="United Kingdom - Extended - Winkeys";
+    
+    // Alphanumeric section
+    key <TLDE> { [ dead_grave,    notsign,       brokenbar,    NoSymbol ] };
+    
+    key <AE02> { [     2,        quotedbl,  dead_diaeresis,     onehalf ] };
+    key <AE03> { [     3,        sterling,   threesuperior,    onethird ] };
+    key <AE04> { [     4,          dollar,        EuroSign,  onequarter ] };
+    key <AE06> { [     6,     asciicircum, dead_circumflex,    NoSymbol ] };
+
+    key <AD02> { [   w,                 W,          wacute,      Wacute ] };
+    key <AD03> { [   e,                 E,          eacute,      Eacute ] };
+    key <AD06> { [   y,                 Y,          yacute,      Yacute ] };
+    key <AD07> { [   u,                 U,          uacute,      Uacute ] };
+    key <AD08> { [   i,                 I,          iacute,      Iacute ] };
+    key <AD09> { [   o,                 O,          oacute,      Oacute ] };
+
+    key <AC01> { [   a,                 A,          aacute,      Aacute ] };
+    key <AC11> { [  apostrophe,         at,     dead_acute,    NoSymbol ] };
+
+    key <AB03> { [   c,                 C,        ccedilla,    Ccedilla ] };
+
+    key <BKSL>  { [ numbersign, asciitilde,     dead_tilde,    NoSymbol ] };
+    key <LSGT>  { [  backslash,        bar,       NoSymbol,    NoSymbol ] };
+    // End alphanumeric section
+
+    include "level3(ralt_switch)"
+};
+
 // Describe the differences between the US Colemak layout
 // and a UK variant. By Andy Buckley (andy@insectnation.org)
 
@@ -93,11 +137,12 @@ xkb_symbols "dvorak" {
 
     name[Group1]="United Kingdom - Dvorak";
 
-    key <BKSL> { [ numbersign,	asciitilde	] };
+    key <AD01> { [ apostrophe,	at		] };
     key <AE02> { [	    2,	quotedbl,  twosuperior,   NoSymbol	] };
     key <AE03> { [	    3,	sterling,  threesuperior, NoSymbol	] };
+    key <BKSL> { [ numbersign,	asciitilde	] };
     key <LSGT> { [  backslash,	bar		] };
-    key <AD01> { [ apostrophe,	at		] };
+    key <TLDE> { [	grave,	notsign,   bar,           bar		] };
 };
 
 // Dvorak letter positions, but punctuation all in the normal UK positions.
diff --git a/xorg-server/xkbdata.src/symbols/gr b/xorg-server/xkbdata.src/symbols/gr
index 5d7efc1a3..4ededb3ff 100644
--- a/xorg-server/xkbdata.src/symbols/gr
+++ b/xorg-server/xkbdata.src/symbols/gr
@@ -12,10 +12,13 @@
 default partial alphanumeric_keys alternate_group
 xkb_symbols "basic" {
 	name[Group1] = "Greece";
+
 	include "eurosign(e)"
 	include "eurosign(5)"
 	include "gr(simple)"
 	include "kpdl(comma)"
+	include "level3(ralt_switch)"
+
 	key <AB01> { [       NoSymbol,       NoSymbol,          U037D,          U03FF ] };
 	key <AB02> { [       NoSymbol,       NoSymbol,     rightarrow,      leftarrow ] };
 	key <AB03> { [       NoSymbol,       NoSymbol,      copyright                 ] };
diff --git a/xorg-server/xkbdata.src/symbols/group b/xorg-server/xkbdata.src/symbols/group
index eaa6858c6..1b23e31c2 100644
--- a/xorg-server/xkbdata.src/symbols/group
+++ b/xorg-server/xkbdata.src/symbols/group
@@ -135,6 +135,26 @@ xkb_symbols "shift_caps_switch" {
     key <CAPS> { [ ISO_First_Group, ISO_Last_Group ] };
 };
 
+// using the group(win_menu_switch) map, pressing:
+// LWIN selects the first group
+// RWIN or MENU selects the last group
+partial modifier_keys
+xkb_symbols "win_menu_switch" {
+    virtual_modifiers AltGr;
+    key <LWIN> {
+        virtualMods= AltGr,
+        symbols[Group1] = [ ISO_First_Group ]
+    };
+    key <MENU> {
+        virtualMods= AltGr,
+        symbols[Group1] = [ ISO_Last_Group ]
+    };
+    key <RWIN> {
+        virtualMods= AltGr,
+        symbols[Group1] = [ ISO_Last_Group ]
+    };
+};
+
 // using the group(ctrl_alt_toggle) map, pressing:
 //     Control_L+Alt_L locks the previous group
 //     Control_R+Alt_R locks the next group
@@ -319,3 +339,22 @@ xkb_symbols "olpc" {
   key <I219>  { [ ISO_Next_Group, ISO_Prev_Group ] };
 };
 
+partial modifier_keys
+xkb_symbols "alt_space_toggle" {
+    key <SPCE> {
+    type[Group1]="PC_ALT_LEVEL2",
+    symbols[Group1]= [ space,   ISO_Next_Group ]
+    };
+};
+
+// using the group(sclk_toggle) map, pressing the Scroll Lock key
+// toggles groups.
+partial modifier_keys
+xkb_symbols "sclk_toggle" {
+  virtual_modifiers AltGr;
+  key <SCLK> {
+    virtualMods= AltGr,
+    symbols[Group1] = [ ISO_Next_Group ]
+    };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/hp_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/hp_vndr/Makefile.in
index e37fe49a5..61fa05a1d 100644
--- a/xorg-server/xkbdata.src/symbols/hp_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/hp_vndr/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -57,8 +53,6 @@ DATA = $(dist_symbols_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -160,6 +131,7 @@ am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build_alias = @build_alias@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 xkb_base = @xkb_base@
 xkb_rules_symlink = @xkb_rules_symlink@
 symbolsdir = $(xkb_base)/symbols/hp_vndr
@@ -198,8 +174,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -223,10 +199,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
 install-dist_symbolsDATA: $(dist_symbols_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+	test -z "$(symbolsdir)" || $(MKDIR_P) "$(DESTDIR)$(symbolsdir)"
 	@list='$(dist_symbols_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -249,22 +224,21 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -280,7 +254,7 @@ check: check-am
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(symbolsdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -326,12 +300,20 @@ info-am:
 
 install-data-am: install-dist_symbolsDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -350,17 +332,21 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dist_symbolsDATA uninstall-info-am
+uninstall-am: uninstall-dist_symbolsDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-dist_symbolsDATA install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-dist_symbolsDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_symbolsDATA uninstall-info-am
+	uninstall-dist_symbolsDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/xkbdata.src/symbols/in b/xorg-server/xkbdata.src/symbols/in
index 59e575de1..bb616fdd8 100644
--- a/xorg-server/xkbdata.src/symbols/in
+++ b/xorg-server/xkbdata.src/symbols/in
@@ -969,9 +969,21 @@ xkb_symbols "tel" {
 };
 
 partial alphanumeric_keys 
-xkb_symbols "urd" {
-    include "pk(urd)"
-    name[Group1]= "India - Urdu";
+xkb_symbols "urd-phonetic" {
+    include "pk(urd-phonetic)"
+    name[Group1]= "India - Urdu, Phonetic";
+};
+
+partial alphanumeric_keys 
+xkb_symbols "urd-phonetic3" {
+    include "pk(urd-crulp)"
+    name[Group1]= "India - Urdu, Alternative phonetic";
+};
+
+partial alphanumeric_keys 
+xkb_symbols "urd-winkeys" {
+    include "pk(urd-nla)"
+    name[Group1]= "India - Urdu, Winkeys";
 };
 
 // based on a keyboard map from an 'xkb/symbols/gur' file
@@ -1177,3 +1189,70 @@ xkb_symbols "olpc" {
 
   include "group(olpc)"
 };
+
+partial alphanumeric_keys 
+xkb_symbols "hin-wx" {
+
+    name[Group1]= "India - Hindi Wx";
+
+      key <TLDE> {	 [     grave, asciitilde, 2, 3    ]	};
+
+      key <AE01> {	 [      0x1000967, exclam 		]	};
+      key <AE02> {	 [      0x1000968, at 		]	};
+      key <AE03> {	 [      0x1000969 , numbersign	 		]	};
+      key <AE04> {	 [      0x100096A , dollar		]	};
+      key <AE05> {	 [      0x100096B , percent 	 		]	};
+      key <AE06> {	 [      0x100096C , asciicircum	 		]	};
+      key <AE07> {	 [      0x100096D , ampersand                       ]	};
+      key <AE08> {	 [      0x100096e , asterisk 	 		]	};
+      key <AE09> {	 [      0x100096F, parenleft 		]	};
+      key <AE10> {	 [      0x1000966, parenright 		]	};
+      key <AE11> {	 [      minus, underscore 	 		]	};
+      key <AE12> {	 [      equal, plus 		]	};
+
+
+      key <AD01> {	 [      0x1000943,  0x1000944, 0x100090B, 0x1000960]	};
+      key <AD02> {	 [      0x1000924,  0x1000925       	]	};
+      key <AD03> {	 [      0x1000947,  0x1000948, 0x100090F, 0x1000910]	};
+      key <AD04> {	 [      0x1000930,  0x1000937       	]	};
+      key <AD05> {	 [      0x100091F,  0x1000920       	]	};
+
+
+      key <AD06> {	 [      0x100092F 		]	};
+      key <AD07> {	 [      0x1000941,  0x1000942, 0x1000909, 0x100090A ]	};
+      key <AD08> {	 [      0x100093F,  0x1000940, 0x1000907, 0x1000908 ]	};
+      key <AD09> {	 [      0x100094B,  0x100094C, 0x1000913, 0x1000914]	};
+      key <AD10> {	 [      0x100092A,  0x100092B 		]	};
+      key <AD11> {	 [      bracketleft, braceleft  		]	};
+      key <AD12> {	 [      bracketright, braceright  		]	};
+      key <BKSL> {       [      backslash, bar, 0x1000964, 0x1000965 ] };
+
+      key <AC01> {	 [      0x100094D,  0x100093E, 0x1000905,0x1000906 ] 	};
+      key <AC02> {	 [      0x1000938,  0x1000936       	]	};
+      key <AC03> {	 [      0x1000921,  0x1000922       	]	};
+      key <AC04> {	 [      0x1000919,  0x100091E       	]	};
+      key <AC05> {	 [      0x1000917,  0x1000918       	]	};
+
+
+      key <AC06> {	 [      0x1000939,  0x1000903 		]	};
+      key <AC07> {	 [      0x100091C,  0x100091D 		]	};
+      key <AC08> {	 [      0x1000915,  0x1000916 		]	};
+      key <AC09> {	 [      0x1000932,  0x1000962, 0x1000933, 0x100090C]	};
+      key <AC10> {	 [      semicolon, colon  		]	};
+      key <AC11> {	 [      quoteright, quotedbl 		]	};
+      key <BKSL> {	 [      backslash,         bar  		]	};
+
+      key <AB01> {	 [      0x1000901,   0x100093C, 0x100093D, 0x1000950]   };
+      key <AB02> {       [      0x1000926,   0x1000927      ]       };
+      key <AB03> {       [      0x100091A,   0x100091B         ]       };
+      key <AB04> {       [      0x1000935,   dead_V        ]       };
+      key <AB05> {       [      0x100092C,   0x100092D        ]       };
+      key <AB06> {       [      0x1000928,   0x1000923         ]       };
+      key <AB07> {       [      0x100092E,   0x1000902         ]       };
+      key <AB08> {       [      comma,       less         ]       };
+      key <AB09> {       [      period,      greater       ]       };
+      key <AB10> {       [      slash,      question        ]       };
+
+    include "level3(ralt_switch)"
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/inet b/xorg-server/xkbdata.src/symbols/inet
index 54ec2418c..a159021f8 100644
--- a/xorg-server/xkbdata.src/symbols/inet
+++ b/xorg-server/xkbdata.src/symbols/inet
@@ -23,6 +23,7 @@
 // Very common set of media keys
 partial hidden alphanumeric_keys
 xkb_symbols "media_common" {
+    key <I01>   {       [ XF86AudioMedia        ] }; 
     key <I10>   {       [ XF86AudioPrev         ] };
     key <I19>   {       [ XF86AudioNext         ] };
     key <I20>   {       [ XF86AudioMute         ] };
@@ -30,21 +31,62 @@ xkb_symbols "media_common" {
     key <I24>   {       [ XF86AudioStop, XF86Eject ] };
     key <I2E>   {       [ XF86AudioLowerVolume  ] };	
     key <I30>   {       [ XF86AudioRaiseVolume  ] };
+    key <K5A>   {       [ XF86Eject             ] };
 };
 
 // popular web navigation combination
 partial hidden alphanumeric_keys
 xkb_symbols "nav_common" {
-    key <I69>   {       [ XF86Forward           ]       };
-    key <I6A>   {       [ XF86Back              ]       };
+    key <I21>   {       [ XF86Calculator        ] }; 
+    key <I32>   {       [ XF86WWW               ] };
+    key <I65>   {       [ XF86Search            ] };
+    key <I66>   {       [ XF86Favorites         ] };
+    key <I67>   {       [ XF86Reload            ] };
+    key <I68>   {       [ XF86Stop              ] };
+    key <I69>   {       [ XF86Forward           ] };
+    key <I6A>   {       [ XF86Back              ] };
+    key <I6B>   {       [ XF86MyComputer        ] };
+    key <I6C>   {       [ XF86Mail              ] };
+    key <I6D>   {       [ XF86AudioMedia        ] }; 
 };
 
+// ACPI Standard
+partial hidden alphanumeric_keys
+xkb_symbols "acpi_common" {
+    key <I5E>	{	[ XF86PowerOff		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I63>	{	[ XF86WakeUp		]	};
+    key <I74>	{	[ XF86Battery		]	};
+    key <I76>	{	[ XF86WLAN		]	};
+    key <I16>	{	[ XF86Sleep		]	};
+};
+
+// Combined sections, for simplicity
 partial hidden alphanumeric_keys
 xkb_symbols "media_nav_common" {
     include "inet(media_common)"
     include "inet(nav_common)"
 };
 
+partial hidden alphanumeric_keys
+xkb_symbols "media_nav_acpi_common" {
+    include "inet(media_common)"
+    include "inet(nav_common)"
+    include "inet(acpi_common)"
+};
+
+partial hidden alphanumeric_keys
+xkb_symbols "nav_acpi_common" {
+    include "inet(nav_common)"
+    include "inet(acpi_common)"
+};
+
+partial hidden alphanumeric_keys
+xkb_symbols "media_acpi_common" {
+    include "inet(media_common)"
+    include "inet(acpi_common)"
+};
+
 // Evdev Standardized Keycodes
 partial alphanumeric_keys
 xkb_symbols "evdev" {
@@ -65,7 +107,9 @@ xkb_symbols "evdev" {
     key <HELP>   {      [ Help                  ]       };
     key <LNFD>   {      [ Linefeed              ]       };
 
-    key <HZTG>   {      [ Zenkaku_Hankaku       ]       };
+// Commented out because HZTG has same keycode as TLDE
+//    key <HZTG>   {      [ Zenkaku_Hankaku       ]       };
+
     key <HKTG>   {      [ Hiragana_Katakana     ]       };
     key <HENK>   {      [ Henkan                ]       };
     key <MUHE>   {      [ Muhenkan              ]       };
@@ -113,7 +157,7 @@ xkb_symbols "evdev" {
 //  key <I178>   {      [ ]       }; // KEY_ISO
     key <I179>   {      [ XF86Tools             ]       };
     key <I180>   {      [ XF86HomePage          ]       };
-    key <I181>   {      [ XF86Refresh           ]       };
+    key <I181>   {      [ XF86Reload           ]       };
     key <I182>   {      [ XF86Close             ]       };
 //  key <I183>   {      [ ]       }; // KEY_MOVE
 //  key <I184>   {      [ ]       }; // KEY_EDIT
@@ -127,7 +171,7 @@ xkb_symbols "evdev" {
     key <I209>   {      [ XF86AudioPause        ]       };
     key <I210>   {      [ XF86Launch3           ]       };
     key <I211>   {      [ XF86Launch4           ]       };
-    key <I213>   {      [ XF86Standby           ]       };
+    key <I213>   {      [ XF86Suspend           ]       };
     key <I214>   {      [ XF86Close             ]       };
     key <I215>   {      [ XF86AudioPlay         ]       };
     key <I216>   {      [ XF86Forward           ]       };
@@ -158,64 +202,24 @@ xkb_symbols "evdev" {
     key <I241>   {      [ XF86MailForward       ]       };
     key <I242>   {      [ XF86Save              ]       };
     key <I243>   {      [ XF86Documents         ]       };
-//  key <I244>   {      [ ]       }; // KEY_BATTERY
-//  key <I245>   {      [ ]       }; // KEY_BLUETOOTH
-//  key <I246>   {      [ ]       }; // KEY_WLAN
+    key <I244>   {      [ XF86Battery           ]       };
+    key <I245>   {      [ XF86Bluetooth         ]       };
+    key <I246>   {      [ XF86WLAN              ]       };
 //  key <I249>   {      [ ]       }; // KEY_VIDEO_NEXT  --  drive next video source
 //  key <I250>   {      [ ]       }; // KEY_VIDEO_PREV  --  drive previous video source
 //  key <I251>   {      [ ]       }; // KEY_BRIGHTNESS_CYCLE  --  bright up, max++ == min
 //  key <I252>   {      [ ]       }; // KEY_BRIGHTNESS_ZERO  --  brightness off
 //  key <I253>   {      [ ]       }; // KEY_DISPLAY_OFF  --  turn off display
+//  key <I254>   {      [ ]       }; // KEY_WIMAX
+    key <I255>   {      [ XF86Hibernate         ]       }; // KEY_HIBERNATE
  
 };
 
 
-// A4Tech KB-21
-partial alphanumeric_keys
-xkb_symbols "a4techKB21" {
-    include "inet(media_nav_common)"
-    key <I32>   {       [ XF86HomePage          ]       };
-    key <I65>   {       [ XF86Search            ]       };
-    key <I66>   {       [ XF86Favorites         ]       };
-    key <I67>   {       [ XF86Refresh           ]       };
-    key <I68>   {       [ XF86Stop              ]       };
-    key <I6B>   {       [ XF86MyComputer        ]       };
-    key <I6C>   {       [ XF86Mail              ]       };
-};
-
-// A4 KBS-8. Contributed by ojo at force dot sk
-partial alphanumeric_keys 
-xkb_symbols "a4techKBS8" { 
-    include "inet(a4techKB21)"
-    key <I21>   {       [ XF86Calculator        ]       }; 
-    key <I5F>   {       [ XF86Standby           ]       }; 
-    key <I6D>   {       [ XF86AudioMedia        ]       }; 
-};
-
-// A4Tech Wireless Desktop (RFKB-23)
-partial alphanumeric_keys
-xkb_symbols "a4_rfkb23" {
-    include "inet(media_common)"
-    key <I21>   {       [ XF86Calculator                ]       };
-    key <I32>   {       [ XF86HomePage                  ]       };
-    key <I32>   {       [ XF86WWW                       ]       };
-    key <I5F>   {       [ XF86Sleep                     ]       };
-    key <I65>   {       [ XF86Search                    ]       };
-    key <I66>   {       [ XF86Favorites                 ]       };
-    key <I67>   {       [ XF86Refresh                   ]       };
-    key <I68>   {       [ XF86Stop                      ]       };
-// should they be swapped?
-    key <I69>   {       [ XF86Back                      ]       };
-    key <I6A>   {       [ XF86Forward                   ]       };
-
-    key <I6B>   {       [ XF86MyComputer                ]       };
-    key <I6C>   {       [ XF86Mail                      ]       };
-    key <I6D>   {       [ XF86AudioMedia                ]       };
-};
-
 // Acer AirKey V
 partial alphanumeric_keys
 xkb_symbols "airkey" {
+    include "inet(acpi_common)"
     key <I13>	{	[ XF86AudioNext		]	};
     key <I15>	{	[ XF86AudioPlay, XF86AudioPause ] };
     key <I16>	{	[ XF86Mail		]	};
@@ -226,22 +230,18 @@ xkb_symbols "airkey" {
     key <I2D>	{	[ XF86AudioRaiseVolume	]	};
     key <I2F>	{	[ XF86Terminal		]	};
     key <I31>	{	[ XF86AudioStop, XF86Eject ]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I63>	{	[ XF86Standby		]	};
 };
 
 // Acer C300 Laptop
 partial alphanumeric_keys
 xkb_symbols "acer_c300" {
-
+    include "inet(nav_common)"
     key <I17>   {       [ F14                   ]       };
     key <I1F>   {       [ F13                   ]       };
     key <I20>   {       [ XF86AudioMute         ]       };
     key <I2E>   {       [ XF86AudioLowerVolume  ]       };
     key <I30>   {       [ XF86AudioRaiseVolume  ]       };
-    key <I32>   {       [ XF86Mail              ]       };
     key <I5E>   {       [ XF86Launch2           ]       };
-    key <I6C>   {       [ XF86WWW               ]       };
     key <I75>   {       [ Help                  ]       };
     key <XFER>  {       [ XF86Launch1           ]       };
 };
@@ -250,12 +250,10 @@ xkb_symbols "acer_c300" {
 // From Alex Dubov <oakad@yahoo.com>
 partial alphanumeric_keys
 xkb_symbols "acer_ferrari4k" {
-    include "inet(media_common)"
+    include "inet(media_nav_common)"
     key <I24>   {       [ dollar                ]       };
     key <I25>   {       [ EuroSign              ]       };
     key <I26>   {       [ XF86Display           ]       };
-    key <I32>   {       [ XF86WWW               ]       }; //"Saturn" button
-    key <I6C>   {       [ XF86Mail              ]       }; //"mail" button
     // Missing keycodes - set-up with setkeycodes
     key <I70>   {       [ Help                  ]       };
     key <I71>   {       [ XF86Launch1           ]       };
@@ -271,17 +269,14 @@ xkb_symbols "acer_ferrari4k" {
 // (Not all these keys will be available on every Acer laptop)
 partial alphanumeric_keys
 xkb_symbols "acer_laptop" {
-    include "inet(media_common)"
+    include "inet(media_nav_acpi_common)"
     key <I17>   {       [ XF86Launch2           ]        }; // "P" or "P2" (HAL)
     key <I1F>   {       [ XF86Launch1           ]        }; // "e" or "P1" (HAL)
 
     // Hotkeys (Function)
     // Launch Keys
     // Device keys
-    key <I32>   {       [ XF86WWW               ]        }; // "Saturn" button
     key <I56>   {       [ XF86Display           ]        }; // Fn+F5 (HAL)
-    key <I5F>   {       [ XF86Sleep             ]        }; // Fn+F4
-    key <I6C>   {       [ XF86Mail              ]        }; // "mail" button
     key <I71>   {       [ XF86Launch4           ]        }; // Fn+F3 (HAL)
     key <I72>   {       [ XF86LaunchB           ]        }; // Bluetooth (HAL)
     key <I73>   {       [ XF86LaunchA           ]        }; // Wireless (HAL)
@@ -299,74 +294,33 @@ xkb_symbols "acer_laptop" {
 //  key <K5E>   {       [ dollar                ]        }; // Dollar (HAL)
 };
 
-// Asus
-partial alphanumeric_keys
-xkb_symbols "asus_laptop" {
-    include "inet(media_common)"
-    key <I32>   {       [ XF86WWW               ]       };
-    key <I6C>   {       [ XF86Mail              ]       };
-};
-
 // Azona
 
 // Azona RF2300 wireless Internet Keyboard
 partial alphanumeric_keys
 xkb_symbols "azonaRF2300" {
     // From Radics Laszlo <garaboncias@mailbox.hu>
-    include "inet(nav_common)"
-    key <I02>   {       [ XF86WWW               ]       };
+    include "inet(nav_acpi_common)"
+    key <I02>   {       [ XF86HomePage          ]       };
     key <I17>   {       [ XF86AudioStop         ]       };
     key <I1E>   {       [ XF86AudioRaiseVolume  ]       };
     key <I1F>   {       [ XF86AudioPlay, XF86AudioPause ] };
-    key <I21>   {       [ XF86Calculator        ]       };
     key <I22>   {       [ XF86AudioNext         ]       };
     key <I24>   {       [ XF86AudioPrev         ]       };
     key <I25>   {       [ XF86AudioLowerVolume  ]       };
     key <I26>   {       [ XF86AudioMute         ]       };
     key <I3C>   {       [ XF86Copy              ]       };
-    key <I5F>   {       [ XF86Standby           ]       };
-    key <I65>   {       [ XF86Search            ]       };
-    key <I66>   {       [ XF86Favorites         ]       };
-    key <I6C>   {       [ XF86Mail              ]       };
     key <I78>   {       [ XF86Cut               ]       };
 //  key <RCTL>  {       [ XF86Paste             ]       };
 };
 
-// ACPI Standard
-partial alphanumeric_keys
-xkb_symbols "acpi" {
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I63>	{	[ XF86WakeUp		]	};
-};
-
-
-// Advance
-
-// Advance Scorpius KI
-partial alphanumeric_keys
-xkb_symbols "scorpius" {
-    include "inet(media_nav_common)"
-    key <I21>	{	[ XF86Calculator	]	};
-    key <I32>	{	[ XF86HomePage		]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I63>	{	[ XF86WakeUp		]	};
-    key <I65>	{	[ XF86Search		]	};
-    key <I66>	{	[ XF86Favorites		]	};
-    key <I67>	{	[ XF86Reload		]	};
-    key <I68>	{	[ XF86Stop		]	};
-    key <I6B>	{	[ XF86MyComputer	]	};
-    key <I6C>	{	[ XF86Mail		]	};
-    key <I6D>	{	[ XF86AudioMedia	]	};
-};
-
 
 // Brother
 
 // Brother Internet Keyboard
 partial alphanumeric_keys
 xkb_symbols "brother" {
+    include "inet(acpi_common)"
     key <I10>	{	[ XF86ScrollUp		]	};
     key <I12>	{	[ XF86AudioPlay, XF86AudioPause ] };
     key <I17>	{	[ XF86AudioPrev		]	};
@@ -382,9 +336,6 @@ xkb_symbols "brother" {
     key <I2E>	{	[ XF86AudioNext		]	};
     key <I30>	{	[ XF86AudioRaiseVolume	]	};
     key <I32>	{	[ XF86ZoomIn		]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I63>	{	[ XF86WakeUp		]	};
     key <I68>	{	[ XF86AudioLowerVolume	]	};
 };
 
@@ -394,6 +345,7 @@ xkb_symbols "brother" {
 // BTC 5113RF Multimedia
 partial alphanumeric_keys
 xkb_symbols "btc5113rf" {
+    include "inet(acpi_common)"
     key <I10>	{	[ XF86AudioStop		]	};
     key <I12>	{	[ XF86AudioMute		]	};
     key <I19>	{	[ XF86AudioPlay, XF86AudioPause ] };
@@ -406,30 +358,13 @@ xkb_symbols "btc5113rf" {
     key <I26>	{	[ XF86Back		]	};
     key <I30>	{	[ XF86WWW		]	};
     key <I32>	{	[ XF86Search		]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I63>	{	[ XF86WakeUp		]	};
-};
-
-// BTC 5126T
-partial alphanumeric_keys
-xkb_symbols "btc5126t" {
-    key <I32>	{	[ XF86WWW		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I6C>	{	[ XF86Mail		]	};
 };
 
-// BTC 6301URF
-partial alphanumeric_keys
-xkb_symbols "btc6301urf" {
-    include "inet(media_nav_common)"
-    include "inet(btc5126t)"
-    key <I66>	{	[ XF86Favorites		]	};
-};
 
 // BTC 9000
 partial alphanumeric_keys
 xkb_symbols "btc9000" {
+    include "inet(acpi_common)"
     key <I10>	{	[ XF86AudioStop		]	};
     key <I12>	{	[ XF86AudioMute		]	};
     key <I19>	{	[ XF86AudioPlay, XF86AudioPause ] };
@@ -443,14 +378,12 @@ xkb_symbols "btc9000" {
     key <I2E>	{	[ XF86Mail		]	};
     key <I30>	{	[ XF86HomePage		]	};
     key <I32>	{	[ XF86Search		]	};
-    key <I5E>   {	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I63>   {	[ XF86WakeUp		]	};
 };
 
 // BTC 9000A
 partial alphanumeric_keys
 xkb_symbols "btc9000a" {
+    include "inet(acpi_common)"
     key <I10>	{	[ XF86AudioStop		]	};
     key <I12>	{	[ XF86AudioMute		]	};
     key <I19>	{	[ XF86AudioPlay, XF86AudioPause ] };
@@ -464,14 +397,12 @@ xkb_symbols "btc9000a" {
     key <I2E>	{	[ Help			]	};
     key <I30>	{	[ XF86WWW		]	};
     key <I32>	{	[ XF86Search		]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I63>	{	[ XF86WakeUp		]	};
 };
 
 // BTC 9001AH
 xkb_symbols "btc9001ah" {
-    key <I02>   {       [ XF86WWW               ]       };
+    include "inet(acpi_common)"
+    key <I02>   {       [ XF86HomePage          ]       };
     key <I17>   {       [ XF86AudioStop         ]       };
     key <I1E>   {       [ XF86AudioRaiseVolume  ]       };
     key <I1F>   {       [ XF86AudioPlay, XF86AudioPause ] };
@@ -479,7 +410,6 @@ xkb_symbols "btc9001ah" {
     key <I24>   {       [ XF86AudioPrev         ]       };
     key <I25>   {       [ XF86AudioLowerVolume  ]       };
     key <I26>   {       [ XF86AudioMute         ]       };
-    key <I5F>   {       [ XF86PowerOff          ]       };
     key <I6C>   {       [ XF86Mail              ]       };
     key <RWIN>  {       [ XF86Eject             ]       };
 };
@@ -487,26 +417,17 @@ xkb_symbols "btc9001ah" {
 // BTC 5090
 partial alphanumeric_keys
 xkb_symbols "btc5090" {
-    include "inet(media_common)"
+    include "inet(media_nav_acpi_common)"
     key <I26>   {       [ XF86Start             ]       };
-    key <I32>   {       [ XF86WWW               ]       };
     key <I33>   {       [ XF86Eject             ]       };
-    key <I5E>   {       [ XF86PowerOff          ]       };
-    key <I5F>   {       [ XF86Standby           ]       };
-    key <I63>   {       [ XF86WakeUp            ]       };
-    key <I65>   {       [ XF86Search            ]       };
-    key <I66>   {       [ XF86Favorites         ]       };
 };
 
 // BTC 9019U
 partial alphanumeric_keys
 xkb_symbols "btc9019u" {
-    include "inet(media_common)"
+    include "inet(media_nav_acpi_common)"
     key <FK17> {	[ XF86Search		]	};
     key <I02>  {	[ XF86HomePage		]	};
-    key <I5F>  {	[ XF86Sleep		]	};
-    key <I66>  {	[ XF86Favorites		]	};
-    key <I6C>  {	[ XF86Mail		]	};
     key <K6C>  {	[ XF86Eject		]	};
 };
 
@@ -521,16 +442,11 @@ xkb_symbols "cherryblue" {
     key <I17>	{	[ XF86AudioStop		]	};
     key <I1E>	{	[ XF86AudioRaiseVolume	]	};
     key <I1F>	{	[ XF86AudioPlay, XF86AudioPause ] };
-    key <I21>	{	[ XF86Calculator	]	};
     key <I22>	{	[ XF86AudioNext		]	};
     key <I24>	{	[ XF86AudioPrev		]	};
     key <I25>	{	[ XF86AudioLowerVolume	]	};
     key <I26>	{	[ XF86AudioMute		]	};
     key <I63>	{	[ XF86Standby		]	};
-    key <I65>	{	[ XF86Search		]	};
-    key <I66>	{	[ XF86MyComputer	]	};
-    key <I68>	{	[ XF86Stop		]	};
-    key <I6C>	{	[ XF86Mail		]	};
     key <PRSC>	{	[ XF86Terminal		]	};
     key <XFER>	{	[ XF86Go		]	};
 };
@@ -549,18 +465,12 @@ xkb_symbols "cherryblueb" {
     key <I17>   {       [ XF86Cut               ]       };
     key <I18>   {       [ XF86Paste             ]       };
     key <I1E>   {       [ XF86AudioRaiseVolume  ]       };
-    key <I21>   {       [ XF86Calculator        ]       };
     key <I25>   {       [ XF86AudioLowerVolume  ]       };
     key <I26>   {       [ XF86AudioMute         ]       };
     key <I2C>   {       [ XF86Book              ]       };
     key <I32>   {       [ XF86Finance           ]       };
     key <I63>   {       [ XF86Standby                   ] };
-    key <I65>   {       [ XF86Search            ]       };
-    key <I66>   {       [ XF86MyComputer        ]       };
     key <I67>   {       [ XF86AudioRewind       ]       };
-    key <I68>   {       [ XF86Stop              ]       };
-    key <I6C>   {       [ XF86Mail              ]       };
-    key <I6D>   {       [ XF86AudioMedia        ]       };
     key <I70>   {       [ XF86Eject             ]       };
     key <I71>   {       [ XF86Book              ]       };
     key <I72>   {       [ XF86Book              ]       };
@@ -571,41 +481,35 @@ xkb_symbols "cherryblueb" {
 // Cherry Blue Line CyBo@rd (alternate option)
 partial alphanumeric_keys
 xkb_symbols "cherrybluea" {
-    include "inet(media_nav_common)"
-    key <I21>	{	[ XF86Calculator	]	};
-    key <I32>	{	[ XF86HomePage		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I65>	{	[ XF86Search		]	};
-    key <I66>	{	[ XF86MyComputer	]	};
-    key <I67>	{	[ XF86Reload		]	};
-    key <I68>	{	[ XF86Stop		]	};
-    key <I6B>	{	[ XF86Terminal		]	};
-    key <I6C>	{	[ XF86Mail		]	};
+    include "inet(media_nav_acpi_common)"
     key <I6D>	{	[ XF86Go		]	};
 };
 
 // Cherry CyBo@rd USB-Hub
 partial alphanumeric_keys
 xkb_symbols "cherrycyboard" {
-    include "inet(media_nav_common)"
+    include "inet(media_nav_acpi_common)"
     key <FK17>    {   [ XF86Search        ]   };
     key <I02> {   [ XF86HomePage      ]   };
-    key <I21> {   [ XF86Calculator    ]   };
-    key <I5F> {   [ XF86Standby       ]   };
-    key <I66> {   [ XF86MyComputer    ]   };
-    key <I67> {   [ XF86Reload        ]   };
-    key <I68> {   [ XF86Stop          ]   };
-    key <I6C> {   [ XF86Mail          ]   };
     key <K67> {   [ XF86Terminal      ]   };
     key <XFER>    {   [ XF86AudioMedia    ]   };
 };
 
+// Cherry CyMotion Expert
+partial alphanumeric_keys 
+xkb_symbols "cherrycmexpert" {
+    include "inet(cherryblueb)"
+    include "inet(acpi_common)"
+    key <FK15>	{	[ XF86Mail		]	};
+};
+
 
 // Chicony
 
 // Chicony Internet Keyboard
 partial alphanumeric_keys 
 xkb_symbols "chicony" {
+    include "inet(acpi_common)"
     key <I12>	{	[ XF86AudioMute		]	};
     key <I17>	{	[ XF86Mail		]	};
     key <I19>	{	[ XF86AudioLowerVolume	]	};
@@ -619,8 +523,7 @@ xkb_symbols "chicony" {
     key <I26>	{	[ XF86LaunchB		]	};
     key <I2E>	{	[ XF86LaunchC		]	};
     key <I30>	{	[ XF86LaunchA		]	};
-    key <I32>	{	[ XF86HomePage		]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
+    key <I32>	{	[ XF86WWW		]	};
     key <I5F>	{	[ XF86ContrastAdjust	]	};
     key <I63>	{	[ XF86BrightnessAdjust	]	};
 };
@@ -629,12 +532,20 @@ xkb_symbols "chicony" {
 partial alphanumeric_keys 
 xkb_symbols "chicony0108" {
     include "inet(cherrycyboard)"
-    key <I66>	{	[ XF86New		]	};
+};
+
+// Chicony KU-0420 AKA Targus Slim Internet Media USB Keyboard
+partial alphanumeric_keys
+xkb_symbols "chicony0420" {
+    include "inet(media_nav_acpi_common)"
+    key <I01>   {       [ XF86AudioMedia        ]       };
+    key <K67>   {       [ XF86MyComputer        ]       };
 };
 
 // Chicony KB-9885
 partial alphanumeric_keys
 xkb_symbols "chicony9885" {
+    include "inet(acpi_common)"
     key <I12>	{	[ XF86AudioMute		]	};
     key <I17>	{	[ XF86Mail		]	};
     key <I19>	{	[ XF86AudioLowerVolume	]	};
@@ -649,9 +560,6 @@ xkb_symbols "chicony9885" {
     key <I2E>	{	[ XF86LaunchC		]	};
     key <I30>	{	[ XF86LaunchA		]	};
     key <I32>	{	[ XF86WWW		]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I63>	{	[ XF86WakeUp		]	};
 };
 
 
@@ -685,19 +593,18 @@ xkb_symbols "compaqik7" {
 // Compaq Internet Keyboard (13 keys)
 partial alphanumeric_keys
 xkb_symbols "compaqik13" {
-    include "inet(media_common)"
+    include "inet(media_acpi_common)"
     key <I1E>	{	[ XF86Mail		]	};
     key <I1F>	{	[ XF86Go		]	};
     key <I21>	{	[ XF86Search		]	};
     key <I23>	{	[ XF86WWW		]	};
     key <I32>	{	[ XF86Shop		]	};
-    key <I5F>	{	[ XF86Standby		]	};
 };
 
 // Compaq Internet Keyboard (18 keys)
 partial alphanumeric_keys
 xkb_symbols "compaqik18" {
-    include "inet(media_common)"
+    include "inet(media_acpi_common)"
     key <I12>	{	[ XF86LightBulb		]	};
     key <I18>	{	[ XF86Eject		]	};
     key <I1E>	{	[ XF86Mail		]	};
@@ -707,7 +614,6 @@ xkb_symbols "compaqik18" {
     key <I25>	{	[ XF86VendorHome	]	};
     key <I26>	{	[ XF86Community		]	};
     key <I32>	{	[ XF86Shop		]	};
-    key <I5F>	{	[ XF86Standby		]	};
     key <I68>	{	[ Print			]	};
 };
 
@@ -715,13 +621,12 @@ xkb_symbols "compaqik18" {
 // Laptop/notebook Compaq (eg. Armada, Evo) Laptop Keyboard
 partial alphanumeric_keys
 xkb_symbols "armada" {
-    include "inet(media_common)"
+    include "inet(media_acpi_common)"
     key <I1A>	{	[ XF86Search		]	};
     key <I1E>	{	[ XF86Mail		]	};
     key <I1F>	{	[ XF86HomePage		]	};
     key <I23>	{	[ XF86WWW		]	};
     key <I59>   {       [ XF86Launch2           ]       }; // Battery Monitor 
-    key <I5F>   {       [ XF86Standby           ]       }; 
     key <I6F>	{	[ XF86AudioMedia	]	};
     key <I75>   {       [ XF86Launch0           ]       }; // Info Center 
 };
@@ -729,14 +634,13 @@ xkb_symbols "armada" {
 // Laptop/notebook Compaq (eg. Presario) Internet Keyboard
 partial alphanumeric_keys
 xkb_symbols "presario" {
-    include "inet(media_common)"
+    include "inet(media_acpi_common)"
     key <I14>	{	[ XF86Q			]	};
     key <I18>	{	[ XF86Launch2		]	};
     key <I1E>	{	[ XF86Mail		]	};
     key <I1F>	{	[ XF86Launch1		]	};
     key <I23>	{	[ XF86WWW		]	};
     key <I32>	{	[ XF86Shop		]	};
-    key <I5F>	{	[ XF86Standby		]	};
     key <I75>	{	[ XF86AudioMedia	]	};
 };
 
@@ -757,10 +661,10 @@ xkb_symbols "ipaq" {
 
 partial alphanumeric_keys
 xkb_symbols "dell" {
+    include "inet(acpi_common)"
     key <I12>	{	[ XF86Mail		]	};
     key <I1E>	{	[ XF86Search		]	};
     key <I26>	{	[ XF86HomePage		]	};
-    key <I5F>	{	[ XF86Standby		]	};
 };
 
 // Dell Precision M65
@@ -771,22 +675,6 @@ xkb_symbols "dellm65" {
     key <LWIN>  {       [ Super_L               ]       };
 };
 
-// Genius KB-19e NB
-partial alphanumeric_keys
-xkb_symbols "geniuskb19e" {
-    include "inet(media_nav_common)"
-    key <I21>   {      [ XF86Calculator        ]       };
-    key <I32>   {      [ XF86HomePage          ]       };
-    key <I5F>   {      [ XF86Sleep             ]       };
-    key <I65>   {      [ XF86Search            ]       };
-    key <I66>   {      [ XF86Favorites         ]       };
-    key <I67>   {      [ XF86Refresh           ]       };
-    key <I68>   {      [ XF86Stop              ]       };
-    key <I6B>   {      [ XF86MyComputer        ]       };
-    key <I6C>   {      [ XF86Mail              ]       };
-    key <I6D>   {      [ XF86AudioMedia        ]       };
-};
-
 // Laptop/notebook Dell Inspiron 8xxx
 partial alphanumeric_keys
 xkb_symbols "inspiron" {
@@ -799,158 +687,55 @@ xkb_symbols "inspiron" {
     key <XFER>  {       [ XF86AudioPlay, XF86AudioPause ] };
 };
 
-partial alphanumeric_keys
-xkb_symbols "latitude" {
-    include "inet(media_common)"
-};
-
-// Laptop/notebook Dell Precision-M series
-partial alphanumeric_keys
-xkb_symbols "precision_m" {
-    // Describes the extra keys on a Precision M series
-    // From Olivier Lahaye <olivier dot lahaye at motorola dot com>
-    include "inet(media_common)"
-    key <I32>	{	[ XF86HomePage		]	};
-};
-
 // DELL USB Multimedia Keyboard (former 8135, generalized, superset of 8125)
 partial alphanumeric_keys
 xkb_symbols "dellusbmm" {
     // Describes the extra keys on a SK-8135 Multimedia keyboard
     // From Olivier Lahaye <olivier dot lahaye at motorola dot com>
-    include "inet(media_nav_common)"
+    include "inet(media_nav_acpi_common)"
     key <I02>	{	[ XF86HomePage		]	};
-    key <I21>	{	[ XF86Calculator	]	};
-    key <I67>	{	[ XF86Reload		]	};
-    key <I68>	{	[ XF86Stop		]	};
-    key <I6C>	{	[ XF86Mail		]	};
     key <K67>	{	[ XF86MyComputer	]	}; 
     key <XFER>	{	[ XF86AudioMedia	]	};  
 };
 
 
-// Dexxa
-
-// Dexxa Wireless Desktop Keyboard
-partial alphanumeric_keys
-xkb_symbols "dexxa" {
-    include "inet(media_common)"
-    key <I32>	{	[ XF86WWW		]	};
-    key <I65>	{	[ XF86Search		]	};
-    key <I66>	{	[ XF86Favorites		]	};
-    key <I67>	{	[ XF86Reload		]	};
-    key <I6C>	{	[ XF86Mail		]	};
-};
-
-
 // Diamond
 
 // Diamond 9801 / 9802 series
 partial alphanumeric_keys
 xkb_symbols "diamond" {
-    include "inet(media_nav_common)"
-    key <I21>	{	[ XF86Calculator	]	};
-    key <I32>	{	[ XF86HomePage		]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I63>	{	[ XF86WakeUp		]	};
-    key <I65>	{	[ XF86Search		]	};
-    key <I66>	{	[ XF86Favorites		]	};
-    key <I67>	{	[ XF86Reload		]	};
-    key <I68>	{	[ XF86Stop		]	};
-    key <I6B>	{	[ XF86MyComputer	]	};
-    key <I6C>	{	[ XF86Mail		]	};
+    include "inet(media_nav_acpi_common)"
     key <I6D>	{	[ XF86Go		]	};
 };
 
-// DTK
-
-// DTK2000
-partial alphanumeric_keys
-xkb_symbols "dtk2000" {
-    // Describes the extra keys on a DTK2000 Internet keyboard.
-    // From Radics Laszlo <garaboncias@mailbox.hu>
-    include "inet(media_nav_common)"
-    key <I21>   {       [ XF86Calculator        ]       };
-    key <I32>   {       [ XF86HomePage          ]       };
-    key <I5E>   {       [ XF86PowerOff          ]       };
-    key <I5F>   {       [ XF86Sleep             ]       };
-    key <I63>   {       [ XF86WakeUp            ]       };
-    key <I65>   {       [ XF86Search            ]       };
-    key <I66>   {       [ XF86Favorites         ]       };
-    key <I67>   {       [ XF86Refresh           ]       };
-    key <I68>   {       [ XF86Stop              ]       };
-    key <I6B>   {       [ XF86MyComputer        ]       };
-    key <I6C>   {       [ XF86Mail              ]       };
-    key <I6D>   {       [ XF86AudioMedia        ]       };
-};
-
 
 // Ennyah
 
 // Ennyah DKB-1008
 partial alphanumeric_keys
 xkb_symbols "ennyah_dkb1008" {
-    include "inet(media_nav_common)"
-    key <I32>	{	[ XF86HomePage		]	};
-    key <I5E>   {	[ XF86PowerOff		]	};
-    key <I5F>   {	[ XF86Standby		]	};
-    key <I63>   {	[ XF86WakeUp		]	};
-    key <I65>	{	[ XF86Search		]	};
-    key <I66>	{	[ XF86Favorites		]	};
-    key <I67>	{	[ XF86Refresh		]	};
-    key <I68>	{	[ XF86Stop		]	};
-    key <I6C>	{	[ XF86Mail		]	};
+    include "inet(media_nav_acpi_common)"
     key <XFER>  {	[ XF86AudioMedia	]	};
 };
 
 
-// Fujitsu-Siemens Computers
-
-// Fujitsu-Siemens Computers AMILO A1667G laptop
-partial alphanumeric_keys
-xkb_symbols "fscaa1667g" {
-   include "inet(media_common)"
-   key <I32>   {       [ XF86WWW               ]       };
-   key <I6C>   {       [ XF86Mail              ]       };
-};
-
-
 // Genius
 
 // Genius Comfy KB-16M / Genius MM Keyboard KWD-910
 partial alphanumeric_keys
 xkb_symbols "genius" {
+    include "inet(media_acpi_common)"
     key <I12>   {	[ XF86AudioRaiseVolume	]	};
     key <I17>   {	[ XF86Calculator	]	};
     key <I19>   {	[ XF86AudioLowerVolume	]	};
     key <I1E>   {	[ XF86Forward		]	};
-    key <I20>   {	[ XF86AudioMute		]	};
     key <I21>   {	[ XF86AudioNext		]	};
-    key <I22>   {	[ XF86AudioPlay, XF86AudioPause ] };
     key <I23>	{	[ XF86AudioPrev		]	};
-    key <I24>   {	[ XF86AudioStop		]	};
     key <I25>   {	[ XF86Back		]	};
     key <I26>   {	[ XF86ScreenSaver	]	};
     key <I2E>   {	[ XF86Mail		]	};
     key <I30>   {	[ XF86Eject		]	};
     key <I32>   {	[ XF86WWW		]	};
-    key <I5F>   {	[ XF86Standby		]	};
-    key <I63>   {	[ XF86WakeUp		]	};
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "geniuscomfy" {
-    // Describes the extra keys on a Genius Comfy KB-12e
-    // From Jurica Vukadin <jura@webit.hr>
-    include "inet(media_nav_common)"
-    key <I21>   {       [ XF86Calculator        ]       };
-    key <I32>   {       [ XF86WWW	        ]       };
-    key <I5F>   {       [ XF86Sleep             ]       };
-    key <I6B>   {       [ XF86MyComputer        ]       };
-    key <I6C>   {       [ XF86Mail              ]       };
-    key <I6D>   {       [ XF86AudioMedia        ]       };
 };
 
 
@@ -959,12 +744,8 @@ partial alphanumeric_keys
 xkb_symbols "geniuscomfy2" {
     // Describes the extra keys on a Genius Comfy KB-21e-Scroll
     // From Radics Laszlo <garaboncias@mailbox.hu>
-    include "inet(geniuscomfy)"
+    include "inet(media_nav_acpi_common)"
     key <I23>   {       [ Return                ]       };
-    key <I65>   {       [ XF86Search            ]       };
-    key <I66>   {       [ XF86Favorites         ]       };
-    key <I67>   {       [ XF86Refresh           ]       };
-    key <I68>   {       [ XF86Stop              ]       };
 };
 
 // Gyration
@@ -973,7 +754,7 @@ partial alphanumeric_keys
 xkb_symbols "gyration" {
     include "inet(nav_common)"
     key <FK16>	{	[ XF86Reload		]	};
-    key <I02>	{	[ XF86WWW		]	};
+    key <I02>	{	[ XF86HomePage		]	};
     key <I17>	{	[ XF86AudioStop		]	};
     key <I1E>	{	[ XF86AudioRaiseVolume	]	};
     key <I1F>	{	[ XF86AudioPlay, XF86AudioPause ] };
@@ -981,10 +762,6 @@ xkb_symbols "gyration" {
     key <I24>	{	[ XF86AudioPrev		]	};
     key <I25>	{	[ XF86AudioLowerVolume	]	};
     key <I26>	{	[ XF86AudioMute		]	};
-    key <I65>	{	[ XF86Search		]	};
-    key <I66>	{	[ XF86Favorites		]	};
-    key <I68>	{	[ XF86Stop		]	};
-    key <I6C>	{	[ XF86Mail		]	};
 };
 
 
@@ -993,17 +770,27 @@ xkb_symbols "gyration" {
 // Hewlett-Packard Internet Keyboard
 partial alphanumeric_keys 
 xkb_symbols "hpi6" {
-    include "inet(media_common)"
+    include "inet(media_nav_acpi_common)"
+    key <I02>   {       [ XF86HomePage          ]       };
     key <I12>	{	[ XF86Search		]	};
+    key <I14>	{	[ XF86VendorHome	]	};
+    key <I15>	{	[ XF86Community		]	};
+    key <I16>	{	[ XF86AudioMedia	]	};
+    key <I18>	{	[ XF86Eject		]	};
+    key <I1E>	{	[ XF86Shop		]	};
+    key <I1F>	{	[ XF86Launch1		]	};
     key <I26>	{	[ Help			]	};
-    key <I5F>	{	[ XF86Standby		]	};
+    key <I27>	{	[ XF86Finance		]	};
+    key <I39>	{	[ Print			]	};
+    key <I75>   {       [ Help                  ]       };
 };
 
-// Hewlett-Packard SK-2501 Multimedia Keyboard
+// Hewlett-Packard SK-2501, SK-2505 Multimedia Keyboard
 partial alphanumeric_keys
-xkb_symbols "hp2501" {
+xkb_symbols "hp250x" {
     key <I12>	{	[ XF86Tools		]	};
     key <I17>	{	[ XF86Search		]	};
+    key <I18>	{	[ XF86Eject		]	};
     key <I1E>	{	[ XF86Mail		]	};
     key <I20>	{	[ XF86AudioMute		]	};
     key <I21>	{	[ XF86Launch5		]	};
@@ -1017,57 +804,6 @@ xkb_symbols "hp2501" {
     key <I32>	{	[ XF86WWW		]	};
 };
 
-// Hewlett-Packard SK-2505 Internet Keyboard
-partial alphanumeric_keys
-xkb_symbols "hp2505" {
-    include "inet(media_common)"
-    key <I18>	{	[ XF86Eject		]	};
-    key <I1E>	{	[ XF86Mail		]	};
-    key <I25>	{	[ XF86Standby		]	};
-    key <I32>	{	[ XF86WWW		]	};
-};
-
-// Hewlett-Packard 5181 Internet Keyboard
-partial alphanumeric_keys
-xkb_symbols "hp5181" {
-    include "inet(media_common)"
-    key <I12>	{	[ XF86Search		]	};
-    key <I14>	{	[ XF86VendorHome	]	};
-    key <I15>	{	[ XF86Community		]	};
-    key <I16>	{	[ XF86AudioMedia	]	};
-    key <I18>	{	[ XF86Eject		]	};
-    key <I1E>	{	[ XF86Shop		]	};
-    key <I1F>	{	[ XF86Launch1		]	};
-    key <I26>	{	[ Help			]	};
-    key <I27>	{	[ XF86Finance		]	};
-    key <I32>	{	[ XF86HomePage		]	};
-    key <I39>	{	[ Print			]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I6C>	{	[ XF86Mail		]	};
-};
-
-// Hewlett-Packard 5185 Internet Keyboard
-partial alphanumeric_keys
-xkb_symbols "hp5185" {
-    include "inet(media_common)"
-    key <I02>   {       [ XF86WWW               ]       };
-    key <I12>   {       [ XF86Go                ]       };
-    key <I14>   {       [ XF86VendorHome        ]       };
-    key <I15>   {       [ XF86Community         ]       };
-    key <I16>   {       [ XF86AudioMedia        ]       };
-    key <I18>   {       [ XF86Eject             ]       };
-    key <I1E>   {       [ XF86Shop              ]       };
-    key <I1F>   {       [ XF86Pictures          ]       };
-    key <I26>   {       [ Help                  ]       };
-    key <I27>   {       [ XF86Finance           ]       };
-    key <I32>   {       [ XF86WWW               ]       };
-    key <I39>   {       [ Print                 ]       };
-    key <I5F>   {       [ XF86Standby           ]       };
-    key <I65>   {       [ XF86Search            ]       };
-    key <I6C>   {       [ XF86Mail              ]       };
-    key <I75>   {       [ Help                  ]       };
-};
-
 // Hewlett-Packard Omnibook XE3 GC, GD, GE and Pavilion N5xxx
 partial alphanumeric_keys
 xkb_symbols "hpxe3gc" {
@@ -1088,9 +824,7 @@ xkb_symbols "hpxe3gf" {
     // Describes the OneTouch buttons on HP Omnibook XE3 GF models.
     // See http://sourceforge.net/projects/omke for details on enabling
     // these keys
-    include "inet(media_common)"
-    key <I32>	{	[ XF86WWW		]	};
-    key <I6C>	{	[ XF86Mail		]	};
+    include "inet(media_nav_common)"
     key <I73>	{	[ Help			]	};
     key <I74>	{	[ XF86Launch1		]	};
 };
@@ -1101,9 +835,7 @@ xkb_symbols "hpxt1000" {
     // Describes the OneTouch buttons on HP Omnibook XT1000 models.
     // See http://sourceforge.net/projects/omke for details on enabling
     // these keys
-    include "inet(media_common)"
-    key <I32>	{	[ XF86WWW		]	};
-    key <I6C>	{	[ XF86Mail		]	};
+    include "inet(media_nav_common)"
     key <I71>	{	[ XF86Launch3		]	};
     key <I72>	{	[ Help			]	};
     key <I73>	{	[ XF86Launch2		]	};
@@ -1116,25 +848,34 @@ xkb_symbols "hpzt11xx" {
     // Describes the OneTouch buttons on HP Pavilion ZT11xx models.
     // See http://sourceforge.net/projects/omke for details on enabling
     // these keys
-    include "inet(media_common)"
-    key <I32>	{	[ XF86WWW		]	};
-    key <I6C>	{	[ XF86Mail		]	};
+    include "inet(media_nav_common)"
     key <I71>	{	[ XF86Launch3		]	};
     key <I72>	{	[ Help			]	};
     key <I73>	{	[ XF86Launch2		]	};
     key <I74>	{	[ XF86Launch1		]	};
 };
 
+// Hewlett-Packard Pavilion dv5
+partial alphanumeric_keys
+xkb_symbols "hpdv5" {
+    // Describes the OneTouch buttons on HP Pavilion dv5 models.
+    // See http://sourceforge.net/projects/omke for details on enabling
+    // these keys
+    include "inet(media_common)"
+    key <I12>  {       [ XF86ScreenSaver       ]       };
+    key <I32>  {       [ XF86WWW               ]       };
+    key <I75>  {       [ Help                  ]       };
+    key <K6D>  {       [ XF86Launch1           ]       };
+};
+
 // Hewlett-Packard Omnibook XE4xxx and ZE4xxx
 partial alphanumeric_keys
 xkb_symbols "hpxe4xxx" {
     // Describes the OneTouch buttons on HP Omnibook XE4xxx and ZE4xxx
-    // See http://sourceforge.net/projects/omke for details on enabling
     // models.
+    // See http://sourceforge.net/projects/omke for details on enabling
     // these keys
-    include "inet(media_common)"
-    key <I32>	{	[ XF86WWW		]	};
-    key <I6C>	{	[ XF86Mail		]	};
+    include "inet(media_nav_common)"
     key <I70>	{	[ Help			]	};
     key <I71>	{	[ XF86Launch2		]	};
     key <I73>	{	[ XF86Launch1		]	};
@@ -1164,7 +905,6 @@ xkb_symbols "hp5xx" {
 
 // Honeywell
 
-
 // Honeywell Euroboard
 partial alphanumeric_keys
 xkb_symbols "honeywell_euroboard" {
@@ -1214,6 +954,7 @@ xkb_symbols "rapidaccess" {
 // IBM Rapid Access II
 partial alphanumeric_keys 
 xkb_symbols "rapidaccess2" {
+    include "inet(acpi_common)"
     key <I12>	{	[ XF86AudioNext		]	};
     key <I17>	{	[ XF86Favorites		]	};
     key <I1E>	{	[ XF86AudioMute		]	};
@@ -1227,75 +968,40 @@ xkb_symbols "rapidaccess2" {
     key <I2E>	{	[ XF86Search		]	};
     key <I30>	{	[ XF86MyComputer	]	};
     key <I32>	{	[ XF86VendorHome	]	};
-    key <I5F>	{	[ XF86Standby		]	};
-};
-
-// IBM Rapid Access II (alternate option)
-partial alphanumeric_keys
-xkb_symbols "rapidaccess2a" {
-    key <I12>	{	[ XF86AudioNext		]	};
-    key <I17>	{	[ XF86Favorites		]	};
-    key <I1E>	{	[ XF86AudioMute		]	};
-    key <I20>	{	[ XF86AudioStop		]	};
-    key <I21>	{	[ XF86AudioLowerVolume	]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
-    key <I23>	{	[ XF86AudioRaiseVolume	]	};
-    key <I24>	{	[ XF86AudioPrev		]	};
-    key <I25>	{	[ XF86WWW		]	};
-    key <I26>	{	[ XF86Shop		]	};
-    key <I2E>	{	[ Help			]	};
-    key <I30>	{	[ XF86Option		]	};
-    key <I32>	{	[ XF86VendorHome	]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <MENU>	{	[ Menu			]	};
 };
 
-// IBM ThinkPad 41
-partial alphanumeric_keys
-xkb_symbols "thinkpad" {
-    include "inet(media_nav_common)"
-};
-
-
 // IBM ThinkPad 60 series
 partial alphanumeric_keys
 xkb_symbols "thinkpad60" {
     include "inet(media_nav_common)"
-
     key <I1F> { [ XF86VendorHome ] };
 };
 
-
 // IBM Space Saver
 partial alphanumeric_keys
 xkb_symbols "ibm_spacesaver" {
-    key <NMLK>  { [ Num_Lock, Num_Lock ] };
+    key <NMLK>  {
+        type="ONE_LEVEL",
+        symbols[Group1]= [ Num_Lock ]
+    };
 };
 
 // Logitech
 
 // Logitech common definitions
-partial alphanumeric_keys
+partial hidden alphanumeric_keys
 xkb_symbols "logitech_base" {
-
-    include "inet(media_nav_common)"
-    key <I01> {	[ XF86AudioMedia ] };
-    key <I02> { [ XF86WWW ] };
+    include "inet(media_nav_acpi_common)"
+    key <I02> { [ XF86HomePage ] };
     key <I15> { [ XF86Community ] };
     key <I16> { [ XF86ScrollClick ] };
     key <I21> {	[ XF86VendorHome ] };
-    key <I32> { [ XF86HomePage ] };
     key <I3B> { [ XF86New ] };
     key <I3C> { [ XF86Reply ] };
     key <I43> { [ XF86MyComputer ] };
     key <I44> { [ XF86Documents ] };
     key <I57> { [ XF86Pictures ] };
     key <I58> { [ XF86Music ] };
-    key <I5F> { [ XF86Standby ] };
-    key <I65> { [ XF86Search ] };
-    key <I66> {	[ XF86Favorites	] };
-    key <I6C> { [ XF86Mail ] };
-    key <I6D> { [ XF86AudioMedia ] };
 };
 
 // Logitech second set of common keys
@@ -1322,12 +1028,10 @@ xkb_symbols "logitech_set3" {
 partial alphanumeric_keys
 xkb_symbols "logiaccess" {
     include "inet(logitech_base)"
-
     key <FK13>	{	[ XF86MailForward	]	}; 
     key <FK14>	{	[ XF86Send		]	}; 
     key <I11>	{	[ XF86Messenger		]	};
     key <I12>	{	[ XF86WebCam		]	};
-    key <I65>	{	[ XF86Search		]	}; 
 };
 
 // Logitech Cordless Desktop (alternate option)
@@ -1351,16 +1055,13 @@ xkb_symbols "logicink" {
 partial alphanumeric_keys
 xkb_symbols "logiex110" {
     include "inet(logitech_base)"
-
     key <I2F>   {       [ XF86Close             ]       };      // Close
-    key <I21>   {       [ XF86Calculator        ]       };
 
 // Extended function keys
 // In the Console before starting X
 // Using setkeycodes e03b 212 e03c 213 e03d 214 e03e 215 e03f 216 e040 217 
 //       setkeycodes e041 218 e042 219 e043 220 e044 221 e057 222 e058 223 6d 206
 // *=keys that are there but need different symbol names.
-
     key <I3B>   {       [ Help                  ]       };      // F1
     key <FK13>  {       [ XF86Word              ]       };      // F2
     key <FK14>  {       [ XF86Excel             ]       };      // F3
@@ -1379,7 +1080,6 @@ xkb_symbols "logiex110" {
 partial alphanumeric_keys
 xkb_symbols "logiinkse" {
     include "inet(logitech_base)"
-
     key <FK13>	{	[ XF86MailForward	]	};	// F3
     key <FK14>	{	[ XF86Send		]	};	// F4
     key <FK15>	{	[ Undo			]	};	// F5
@@ -1403,7 +1103,6 @@ xkb_symbols "logiinkseusb" {
 partial alphanumeric_keys
 xkb_symbols "logiitc" {
     include "inet(logitech_base)"
-
     key <I2F> {	[ XF86AudioRaiseVolume ] };
 
     // Just to override RaiseVolume from logitech_base,
@@ -1416,7 +1115,6 @@ xkb_symbols "logiitc" {
 partial alphanumeric_keys
 xkb_symbols "logiik" {
     include "inet(logitech_base)"
-
     key <I12>	{	[ Find			]	};
     key <I17>	{	[ Print			]	};
     key <I18>	{	[ XF86Favorites		]	};
@@ -1436,7 +1134,6 @@ xkb_symbols "logiik" {
 partial alphanumeric_keys
 xkb_symbols "itouch" {
     include "inet(logitech_base)"
-
     key <I1F>	{	[ XF86AudioMute		]	};
     key <I2B>	{	[ XF86AudioLowerVolume	]	};
     key <I2D>	{	[ XF86AudioRaiseVolume	]	};
@@ -1455,13 +1152,11 @@ xkb_symbols "logiultraxc" {
 
 partial alphanumeric_keys 
 xkb_symbols "logidinovo" {
-    include "inet(media_common)"
+    include "inet(media_nav_common)"
     key <I02>	{	[ XF86HomePage		]	};
     key <I12>	{	[ XF86Standby		]	};
     key <I17>	{	[ XF86Search		]	};
     key <I21>	{	[ XF86AudioRaiseVolume	]	};
-    key <I66>	{	[ XF86Start		]	};
-    key <I6C>	{	[ XF86Mail		]	};
     key <K66>	{	[ XF86AudioLowerVolume	]	};
     key <KPDC>	{	[ XF86AudioMute		]	};
     key <XFER>	{	[ XF86AudioMedia	]	};
@@ -1469,20 +1164,60 @@ xkb_symbols "logidinovo" {
 
 partial alphanumeric_keys 
 xkb_symbols "logidinovoedge" {
-    include "inet(media_common)"
+    include "inet(media_acpi_common)"
     key <I02>	{	[ XF86HomePage		]	};
-    key <I5F>	{	[ XF86Standby		]	};
     key <I6C>	{	[ XF86Mail		]	};
     key <FK17>  {       [ XF86Search            ]       };
     key <XFER>	{	[ XF86AudioMedia	]	};
 };
 
+partial alphanumeric_keys
+xkb_symbols "logitech_g15" {
+    include "inet(media_nav_acpi_common)"
+    key <AE13> {         [   XF86Messenger ] };
+    key <HKTG> {         [     XF86Launch7 ] };
+    key  <I02> {         [     XF86Launch9 ] };
+    key  <I04> {         [       XF86Phone ] };
+    key  <I08> {         [     XF86LaunchD ] };
+    key  <I09> {         [     XF86Support ] };
+    key  <I0F> {         [     XF86LaunchF ] };
+    key  <I16> {         [      XF86LogOff ] };
+    key  <I18> {         [     XF86Launch5 ] };
+    key  <I21> {         [      XF86Travel ] };
+    key  <I23> {         [       XF86Spell ] };
+    key  <I31> {         [     XF86Launch4 ] };
+    key  <I3C> {         [       XF86Music ] };
+    key  <I42> {         [     XF86Forward ] };
+    key  <I43> {         [        XF86Send ] };
+    key  <I57> {         [        XF86Save ] };
+    key  <I64> {         [    XF86Pictures ] };
+    key  <I67> {         [     XF86LaunchA ] };
+    key  <I76> {         [      XF86iTouch ] };
+    key  <I77> {         [     XF86Launch3 ] };
+    key  <I79> {         [    XF86ToDoList ] };
+    key  <I7B> {         [  XF86Calculator ] };
+    key  <K5A> {         [  XF86VendorHome ] };
+    key  <K5D> {         [        XF86Away ] };
+    key  <K5E> {         [      XF86WebCam ] };
+    key  <K5F> {         [     XF86Launch0 ] };
+    key  <K63> {         [     XF86Launch6 ] };
+    key  <K6D> {         [    XF86Calendar ] };
+    key  <K71> {         [     XF86LaunchB ] };
+    key  <K72> {         [     XF86LaunchC ] };
+    key  <K74> {         [         XF86WWW ] };
+    key  <K75> {         [     XF86LaunchE ] };
+    key <MDSW> {         [     XF86Launch1 ] };
+    key <NFER> {         [     XF86Launch2 ] };
+    key <XFER> {         [     XF86Launch8 ] };
+};
+
+
 // Memorex
 
 // Memorex MX1998
 partial alphanumeric_keys
 xkb_symbols "mx1998" {
-    include "inet(media_common)"
+    include "inet(media_acpi_common)"
     key <DOWN>	{	[ XF86ScrollDown	]	};
     key <I12>	{	[ XF86AudioRewind	]	};
     key <I17>	{	[ XF86Close		]	};
@@ -1494,8 +1229,6 @@ xkb_symbols "mx1998" {
     key <I26>	{	[ Menu			]	};
     key <I32>	{	[ XF86WWW		]	};
     key <I57>	{	[ XF86WakeUp		]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
     key <I68>	{	[ XF86DOS		]	};
     key <I7A>	{	[ XF86ScreenSaver	]	};
     key <UP>	{	[ XF86ScrollUp		]	};
@@ -1504,7 +1237,7 @@ xkb_symbols "mx1998" {
 // Memorex MX2500 EZ-Access Keyboard
 partial alphanumeric_keys
 xkb_symbols "mx2500" {
-    include "inet(media_common)"
+    include "inet(media_nav_acpi_common)"
     key <I12>	{	[ XF86Clear		]	};
     key <I13>	{	[ XF86Phone		]	};
     key <I14>	{	[ XF86DOS		]	};
@@ -1512,30 +1245,16 @@ xkb_symbols "mx2500" {
     key <I18>	{	[ XF86Xfer		]	};
     key <I1E>	{	[ XF86Eject		]	};
     key <I1F>	{	[ XF86Documents		]	};
-    key <I21>	{	[ XF86Calculator	]	};
     key <I26>	{	[ XF86News		]	};
-    key <I32>	{	[ XF86WWW		]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
     key <I6B>	{	[ XF86WakeUp		]	};
-    key <I6C>	{	[ XF86Mail		]	};
     key <I6D>	{	[ XF86RotateWindows	]	};
-    key <LWIN>	{	[ Meta_L		]	};
-    key <MENU>	{	[ Menu			]	};
-    key <RWIN>	{	[ Meta_R		]	};
 };
 
 // Memorex MX2750
 partial alphanumeric_keys
 xkb_symbols "mx2750" {
-    include "inet(media_nav_common)"
+    include "inet(media_nav_acpi_common)"
     key <I32>	{	[ XF86Launch0		]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I63>	{	[ XF86WakeUp		]	};
-    key <I65>	{	[ XF86Search		]	};
-    key <I66>	{	[ XF86Favorites		]	};
-    key <I6C>	{	[ XF86Mail		]	};
 };
 
 
@@ -1549,17 +1268,12 @@ xkb_symbols "microsoft7000" {
     key <I09>	{	[ XF86New		]	};
     key <I0A>	{	[ Redo			]	};
     key <I0E>	{	[ XF86MailForward	]	};
-    key <I21>	{	[ XF86Calculator	]	};
     key <I2F>	{	[ XF86Close		]	};
-    key <I32>	{	[ XF86HomePage		]	};
     key <I39>	{	[ Print			]	};
     key <I55>	{	[ XF86Save		]	};
     key <I5A>	{	[ XF86Send		]	};
     key <I62>	{	[ Help			]	};
     key <I64>	{	[ XF86Reply		]	};
-    key <I65>	{	[ XF86Search		]	};
-    key <I66>	{	[ XF86Favorites		]	};
-    key <I6C>	{	[ XF86Mail		]	};
     key <I76>	{	[ parenleft		]	};
     key <I7B>	{	[ parenright		]	};
     key <K59>	{	[ KP_Equal		]	};
@@ -1571,34 +1285,8 @@ xkb_symbols "microsoft7000" {
 // Microsoft Internet Keyboard
 partial alphanumeric_keys
 xkb_symbols "microsoftinet" {
-    include "inet(nav_common)"
-    key <I21>	{	[ XF86Calculator	]	};
-    key <I32>	{	[ XF86WWW		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I65>	{	[ XF86Search		]	};
-    key <I66>	{	[ XF86Favorites		]	};
+    include "inet(nav_acpi_common)"
     key <I68>	{	[ XF86AudioStop		]	};
-    key <I6B>	{	[ XF86MyComputer	]	};
-    key <I6C>	{	[ XF86Mail		]	};
-};
-
-// Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro
-partial alphanumeric_keys 
-xkb_symbols "microsoftpro" {
-    include "inet(media_nav_common)"
-    key <I21>	{	[ XF86Calculator	]	};
-    key <I32>	{	[ XF86HomePage		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I65>	{	[ XF86Search		]	};
-    key <I66>	{	[ XF86Favorites		]	};
-    key <I67>	{	[ XF86Reload		]	};
-    key <I68>	{	[ XF86Stop		]	};
-    key <I6B>	{	[ XF86MyComputer	]	};
-    key <I6C>	{	[ XF86Mail		]	};
-    key <I6D>	{	[ XF86AudioMedia	]	};
-//   Internet Section -- Left Side
-//   Multimedia Section -- Right Side
-//   My Computer Section -- Far Right
 };
 
 // Microsoft Natural Keyboard Pro USB  
@@ -1611,16 +1299,11 @@ partial alphanumeric_keys
      key <I17>   {   [ XF86AudioStop      ]   };  
      key <I1E>   {   [ XF86AudioRaiseVolume   ]   };  
      key <I1F>   {   [ XF86AudioPlay, XF86AudioPause ] };  
-     key <I21>   {   [ XF86Calculator   ]   };  
      key <I22>   {   [ XF86AudioNext      ]   };  
      key <I24>   {   [ XF86AudioPrev      ]   };  
      key <I25>   {   [ XF86AudioLowerVolume   ]   };  
      key <I26>   {   [ XF86AudioMute      ]   };  
      key <I63>   {   [ XF86Standby      ]   };  
-     key <I65>   {   [ XF86Search      ]   };  
-     key <I66>   {   [ XF86Favorites      ]   };  
-     key <I68>   {   [ XF86Stop      ]   };  
-     key <I6C>   {   [ XF86Mail      ]   };  
  //   Internet Section -- Left Side  
  //   Multimedia Section -- Right Side  
  //   My Computer Section -- Far Right  
@@ -1633,14 +1316,8 @@ partial alphanumeric_keys
 xkb_symbols "microsoftprooem" { 
     include "inet(media_nav_common)"
     key <FK17>	{	[ XF86Search		]	}; 
-    key <I01>	{	[ XF86AudioMedia	]	}; 
     key <I02>	{	[ XF86HomePage		]	}; 
-    key <I21>	{	[ XF86Calculator	]	}; 
     key <I63>	{	[ XF86Standby		]	}; 
-    key <I66>	{	[ XF86Favorites		]	}; 
-    key <I67>	{	[ XF86Reload		]	}; 
-    key <I68>	{	[ XF86Stop		]	}; 
-    key <I6C>	{	[ XF86Mail		]	}; 
     key <K67>	{	[ XF86MyComputer	]	}; 
 //   Internet Section -- Left Side 
 //   Multimedia Section -- Right Side 
@@ -1656,16 +1333,12 @@ xkb_symbols "microsoftprose" {
     key <I17>	{	[ XF86AudioStop		]	};
     key <I1E>	{	[ XF86AudioRaiseVolume	]	};
     key <I1F>	{	[ XF86AudioPlay, XF86AudioPause ] };
-    key <I21>	{	[ XF86Calculator	]	};
     key <I22>	{	[ XF86AudioNext		]	};
     key <I24>	{	[ XF86AudioPrev		]	};
     key <I25>	{	[ XF86AudioLowerVolume	]	};
     key <I26>	{	[ XF86AudioMute		]	};
     key <I63>	{	[ XF86Standby		]	};
-    key <I65>	{	[ XF86Search		]	};
-    key <I66>	{	[ XF86Favorites		]	};
     key <I68>	{	[ XF86AudioStop		]	};
-    key <I6C>	{	[ XF86Mail		]	};
     key <PRSC>	{	[ XF86MyComputer	]	};
     key <XFER>	{	[ XF86AudioMedia	]	};
 };
@@ -1673,12 +1346,11 @@ xkb_symbols "microsoftprose" {
 // Microsoft Office Keyboard
 partial alphanumeric_keys
 xkb_symbols "microsoftoffice" {
-    include "inet(nav_common)"
+    include "inet(nav_acpi_common)"
     key <BRK>	{	[ XF86Calendar		]	};
     key <END>	{	[ Undo			]	};
-    key <I02>	{	[ XF86WWW		]	};
+    key <I02>	{	[ XF86HomePage		]	};
     key <I1E>	{	[ XF86AudioLowerVolume	]	};
-    key <I21>	{	[ XF86Calculator	]	};
     key <I25>	{	[ XF86AudioRaiseVolume	]	};
     key <I26>	{	[ XF86AudioMute		]	};
     key <I3C>	{	[ XF86Cut		]	};
@@ -1686,15 +1358,13 @@ xkb_symbols "microsoftoffice" {
     key <I54>	{	[ XF86ApplicationLeft	]	};
     key <I55>	{	[ XF86TaskPane		]	};
     key <I56>	{	[ XF86Spell		]	};
-    key <I57>	{	[ XF86HomePage		]	};
+    key <I57>	{	[ XF86WWW		]	};
     key <I58>	{	[ XF86New		]	};
     key <I59>	{	[ XF86Open		]	};
     key <I5A>	{	[ XF86Close		]	};
-    key <I5F>	{	[ XF86Standby		]	};
     key <I62>	{	[ Help			]	};
     key <I64>	{	[ XF86Save		]	};
     key <I67>	{	[ Print			]	};
-    key <I6C>	{	[ XF86Mail		]	};
     key <I6D>	{	[ XF86OfficeHome	]	};
     key <I70>	{	[ Redo			]	};
     key <I71>	{	[ XF86Reply		]	};
@@ -1708,7 +1378,7 @@ xkb_symbols "microsoftoffice" {
 // Microsoft Wireless Multimedia Keyboard 1.0A 
 partial alphanumeric_keys 
 xkb_symbols "microsoftmult" { 
-    include "inet(media_common)"
+    include "inet(media_nav_acpi_common)"
     key <AE13>  {       [ XF86Messenger         ]       }; 
     key <FK14>	{	[ XF86New		]	}; 
     key <FK15>	{	[ XF86Open		]	}; 
@@ -1717,32 +1387,24 @@ xkb_symbols "microsoftmult" {
     key <I07>	{	[ Redo			]	}; 
     key <I08>	{	[ Undo			]	}; 
     key <I16>   {       [ XF86LogOff            ]       }; 
-    key <I21>   {       [ XF86Calculator        ]       }; 
     key <I23>	{	[ XF86Spell		]	}; 
-    key <I32>   {       [ XF86HomePage          ]       }; 
     key <I3B>	{	[ Help			]	}; 
     key <I3C>   {       [ XF86Music     ]       }; 
     key <I42>	{	[ XF86Forward		]	}; 
     key <I43>	{	[ XF86Send		]	}; 
     key <I57>	{	[ XF86Save		]	}; 
     key <I58>	{	[ Print			]	}; 
-    key <I5F>   {       [ XF86Sleep             ]       }; 
     key <I64>   {       [ XF86Pictures  ]       }; 
-    key <I6C>   {       [ XF86Mail              ]       }; 
-    key <I6D>   {       [ XF86AudioMedia        ]       }; 
     key <I80>   {       [ XF86Documents ]       }; 
-//   Control Section -- Far Right 
-//   F-Locked Function keys 
-//   Internet Section -- Right Side 
-//   Multimedia Section -- Centre 
-//   My Computer Section -- Left Side 
 }; 
 
+
 // Oretec
 
 // Oretec MCK-800 MM/Internet keyboard
 partial alphanumeric_keys
 xkb_symbols "oretec" {
+    include "inet(acpi_common)"
     key <I10>	{	[ XF86ScrollUp		]	};
     key <I12>	{	[ XF86AudioPlay, XF86AudioPause ] };
     key <I17>	{	[ XF86AudioPrev		]	};
@@ -1758,9 +1420,6 @@ xkb_symbols "oretec" {
     key <I2E>	{	[ XF86AudioNext		]	};
     key <I30>	{	[ XF86AudioRaiseVolume	]	};
     key <I32>	{	[ XF86ZoomIn		]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I63>	{	[ XF86WakeUp		]	};
     key <I68>	{	[ XF86AudioLowerVolume	]	};
 };
 
@@ -1818,7 +1477,7 @@ xkb_symbols "qtronix" {
 // Samsung SDM 4500P
 partial alphanumeric_keys
 xkb_symbols "samsung4500" {
-    include "inet(media_common)"
+    include "inet(media_nav_acpi_common)"
     key <AE13>	{	[ XF86Launch4		]	};
     key <I02>	{	[ XF86Launch1		]	};
     key <I04>	{	[ XF86Launch3		]	};
@@ -1827,21 +1486,17 @@ xkb_symbols "samsung4500" {
     key <I0A>	{	[ XF86Book		]	};
     key <I18>	{	[ XF86Eject		]	};
     key <I26>	{	[ Help			]	};
-    key <I32>	{	[ XF86WWW		]	};
     key <I59>	{	[ XF86Explorer		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I6C>	{	[ XF86Mail		]	};
     key <NFER>	{	[ XF86Launch2		]	};
 };
 
 // Samsung SDM 4510P
 partial alphanumeric_keys
 xkb_symbols "samsung4510" {
-    include "inet(media_common)"
+    include "inet(media_acpi_common)"
     key <I02>	{	[ XF86Launch1		]	};
     key <I04>	{	[ XF86Launch3		]	};
     key <I18>	{	[ XF86Eject		]	};
-    key <I5F>	{	[ XF86Standby		]	};
     key <NFER>	{	[ XF86Launch2		]	};
 };
 
@@ -1863,24 +1518,23 @@ xkb_symbols "sk1300" {
 // SK-2500
 partial alphanumeric_keys
 xkb_symbols "sk2500" {
-    include "inet(media_common)"
+    include "inet(media_nav_common)"
     key <I12>	{	[ XF86AudioRewind	]	};
     key <I17>	{	[ XF86Close		]	};
     key <I18>	{	[ XF86Eject		]	};
     key <I18>	{	[ XF86Eject		]	};
     key <I19>	{	[ XF86Forward		]	};
     key <I1E>	{	[ XF86AudioRecord	]	};
-    key <I21>	{	[ XF86Calculator	]	};
     key <I23>	{	[ XF86Xfer		]	};
     key <I25>	{	[ XF86PowerOff		]	};
     key <I26>	{	[ Menu			]	};
-    key <I32>	{	[ XF86WWW		]	};
     key <I7A>	{	[ XF86ScreenSaver	]	};
 };
 
 // SK-6200
 partial alphanumeric_keys
 xkb_symbols "sk6200" {
+    include "inet(acpi_common)"
     key <I12>	{	[ XF86Favorites		]	};
     key <I14>	{	[ XF86AudioLowerVolume	]	};
     key <I16>	{	[ XF86AudioRaiseVolume	]	};
@@ -1893,8 +1547,6 @@ xkb_symbols "sk6200" {
     key <I23>	{	[ XF86AudioPrev		]	};
     key <I24>	{	[ XF86AudioStop		]	};
     key <I32>	{	[ XF86Mail		]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
 };
 
 // SK-7100
@@ -1916,6 +1568,7 @@ xkb_symbols "sk7100" {
 // SVEN Ergonomic 2500
 partial alphanumeric_keys
 xkb_symbols "sven" {
+    include "inet(acpi_common)"
     key <I10>	{	[ XF86AudioPlay, XF86AudioPause ] };
     key <I12>	{	[ XF86Forward		]	};
     key <I17>	{	[ XF86AudioRaiseVolume	]	};
@@ -1936,10 +1589,7 @@ xkb_symbols "sven" {
     key <I30>	{	[ XF86Favorites		]	};
     key <I31>	{	[ XF86ScrollUp		]	};
     key <I32>	{	[ XF86ScrollDown	]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
     key <I62>	{	[ XF86AudioNext		]	};
-    key <I63>	{	[ XF86WakeUp		]	};
     key <I68>	{	[ XF86Back		]	};
 };
 
@@ -1957,6 +1607,7 @@ xkb_symbols "sven303" {
 // Symplon PaceBook (tablet PC)
 partial alphanumeric_keys
 xkb_symbols "symplon" {
+    include "inet(nav_acpi_common)"
     key <HOME>	{	[ XF86RotationPB	]	};
     key <I13>	{	[ XF86SplitScreen	]	};
     key <I14>	{	[ XF86Support		]	};
@@ -1964,10 +1615,7 @@ xkb_symbols "symplon" {
     key <I21>	{	[ XF86User2KB		]	};
     key <I25>	{	[ XF86RotationKB	]	};
     key <I26>	{	[ XF86MenuKB		]	};
-    key <I32>	{	[ XF86WWW		]	};
-    key <I5F>	{	[ XF86Standby		]	};
     key <I6B>	{	[ XF86User1KB		]	};
-    key <I6C>	{	[ XF86Mail		]	};
     key <PAUS>	{	[ XF86UserPB		]	};
     key <UP>	{	[ XF86MenuPB		]	};
 };
@@ -1994,14 +1642,9 @@ xkb_symbols "toshiba_s3000" {
 // Trust Wireless Keyboard Classic
 partial alphanumeric_keys
 xkb_symbols "trust" {
-    include "inet(media_nav_common)"
+    include "inet(media_nav_acpi_common)"
     key <I11>	{	[ XF86ScreenSaver	]	};
     key <I1E>	{	[ XF86Eject		]	};
-    key <I21>	{	[ XF86Calculator	]	};
-    key <I32>	{	[ XF86WWW		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I63>	{	[ XF86WakeUp		]	};
-    key <I6C>	{	[ XF86Mail		]	};
 };
 
 
@@ -2013,7 +1656,6 @@ xkb_symbols "trustda" {
     key <I17>	{	[ XF86Close		]	};
     key <I18>	{	[ XF86Eject		]	};
     key <I1E>	{	[ XF86AudioRecord	]	};
-    key <I21>	{	[ XF86Calculator	]	};
     key <I23>	{	[ XF86Xfer		]	};
     key <I25>	{	[ XF86Standby		]	};
     key <I26>	{	[ Help			]	};
@@ -2027,6 +1669,7 @@ xkb_symbols "trustda" {
 // Yahoo! Internet Keyboard
 partial alphanumeric_keys
 xkb_symbols "yahoo" {
+    include "inet(acpi_common)"
     key <I11>	{	[ XF86AudioPrev		]	};
     key <I12>	{	[ XF86AudioPlay, XF86AudioPause ] };
     key <I1E>	{	[ XF86AudioStop		]	};
@@ -2040,28 +1683,11 @@ xkb_symbols "yahoo" {
     key <I26>	{	[ Help			]	};
     key <I27>	{	[ XF86Mail		]	};
     key <I28>	{	[ XF86WWW		]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I63>	{	[ XF86WakeUp		]	};
-};
-
-// Super Power Internet Keyboard 
- 
-// Super Power Multimedia Keyboard 
-xkb_symbols "sp_inet" { 
-    include "inet(media_nav_common)"
-    key <I32>	{	[ XF86HomePage		]	}; 
-    key <I5E>	{	[ XF86PowerOff		]	}; 
-    key <I5F>	{	[ XF86Standby		]	}; 
-    key <I63>	{	[ XF86WakeUp		]	};       
-    key <I66>	{	[ XF86Favorites		]	}; 
-    key <I67>	{	[ XF86Refresh		]	}; 
-    key <I68>	{	[ XF86Stop		]	}; 
-    key <I6C>	{	[ XF86Mail		]	}; 
 };
 
 // Apple keyboards (macbooks, powerbooks, powermac G5, etc)
-partial xkb_symbols "apple" {
+partial alphanumeric_keys
+xkb_symbols "apple" {
 // Really brightness up/down
     key <II65>  {       [ XF86BrightnessAdjust  ]       };
     key <I54>   {       [ XF86BrightnessAdjust  ]       };
@@ -2073,6 +1699,7 @@ partial xkb_symbols "apple" {
     key <I57>   {       [ XF86Launch0		]	};
     key <I58>	{	[ XF86Launch1    	]	};
     key <I59>	{	[ XF86Launch2   	]	};
+    key <I5E>	{	[ XF86PowerOff          ]       };
     key <K5D>	{	[ F13 ]    };
     key <K5E>	{	[ F14 ]    };
     key <K5F>	{	[ F15 ]    };
@@ -2083,41 +1710,27 @@ partial xkb_symbols "apple" {
 
 partial alphanumeric_keys
 xkb_symbols "cymotionlinux" {
-    include "inet(media_nav_common)"
-    key <FK17>	{	[	XF86Search		]	};
-    key <I02>	{	[	XF86WWW			]	};
-    key <I05>	{	[	Redo			]	};
+    include "inet(media_nav_acpi_common)"
     key <I07>	{	[	Undo			]	};
+    key <I0A>	{	[	Redo			]	};
     key <I0F>	{	[	XF86ScrollDown		]	};
     key <I17>	{	[	XF86Launch2		]	};
     key <I1F>	{	[	XF86Launch1		]	};
-    key <I21>	{	[	XF86Calculator		]	};
     key <I28>	{	[	XF86MenuKB		]	};
     key <I2B>	{	[	XF86Launch3		]	};
     key <I3C>	{	[	XF86Cut			]	};
-    key <I47>	{	[	XF86PowerOff		]	};
-    key <I63>   {	[	XF86Standby		]	};
-    key <I67>	{	[	XF86Reload		]	};
-    key	<I68>	{	[	XF86Stop		]	};
-    key <I6C>	{	[	XF86Mail		]	};
     key <I78>	{	[	XF86Copy		]	};
     key <K65>	{	[	XF86Paste		]	};
-    key <K68>	{	[	XF86Standby		]	};
     key <K6C>	{	[	XF86Eject		]	};
     key <K75>	{	[	XF86ScrollUp		]	};
-    key	<RWIN>	{	[	at		]	};
     key <XFER>	{	[	XF86AudioMedia		]	};
 };
 
 partial alphanumeric_keys 
 xkb_symbols "silvercrest" {
-    include "inet(media_nav_common)"
+    include "inet(media_nav_acpi_common)"
     key <I02>	{	[ XF86HomePage		]	};    
     key <I21>	{	[ XF86Launch2		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I66>	{	[ XF86Favorites		]	};    
-    key <I6C>	{	[ XF86Mail		]	};    
-    key <I6D>	{	[ XF86AudioMedia	]	};
     key <K67>	{	[ XF86Launch1		]	};
 };
 
@@ -2125,12 +1738,8 @@ xkb_symbols "silvercrest" {
 
 partial alphanumeric_keys
 xkb_symbols "emachines" {
-    include "inet(media_common)"
+    include "inet(media_nav_acpi_common)"
     key <I32>  {  [ XF86iTouch                    ]  };
-    key <I5F>  {  [ XF86Sleep                     ]  };
-    key <I65>  {  [ XF86Search                    ]  };
-    key <I6C>  {  [ XF86Mail                      ]  };
-    key <I6D>  {  [ XF86AudioMedia                ]  };
     key <KP0>  {  [ KP_0                          ]  };
     key <KP1>  {  [ KP_1                          ]  };
     key <KP2>  {  [ KP_2                          ]  };
@@ -2159,70 +1768,11 @@ xkb_symbols "emachines" {
 // setkeycodes e075 171 # KEY_CONFIG from /usr/include/linux/input.h
 partial alphanumeric_keys
 xkb_symbols "benqx" {
-    include "inet(media_nav_common)"
+    include "inet(media_nav_acpi_common)"
     key <I02> { [ XF86ModeLock ] };
     key <I21> { [ XF86WWW      ]  };
     key <I2B> { [ XF86Go ] };
     key <I31> { [ XF86Calendar ] };
-    key <I32> { [ XF86WWW ] };
-    key <I5E> { [ XF86PowerOff ]  };
-    key <I5F> { [ XF86ScreenSaver ] };
-    key <I63> { [ XF86WakeUp   ]  };
-    key <I65> { [ XF86Search ] };
-    key <I66> { [ XF86Favorites ] };
-    key <I6C> { [ XF86Mail ] };
-    key <I6D> { [ XF86AudioMedia ] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "logitech_g15" {
-
-    include "inet(media_common)"
-    key <AE13> {         [   XF86Messenger ] };
-
-    key <HKTG> {         [     XF86Launch7 ] };
-
-    key  <I02> {         [     XF86Launch9 ] };
-    key  <I04> {         [       XF86Phone ] };
-    key  <I08> {         [     XF86LaunchD ] };
-    key  <I09> {         [     XF86Support ] };
-    key  <I0F> {         [     XF86LaunchF ] };
-    key  <I16> {         [      XF86LogOff ] };
-    key  <I18> {         [     XF86Launch5 ] };
-    key  <I21> {         [      XF86Travel ] };
-    key  <I23> {         [       XF86Spell ] };
-    key  <I31> {         [     XF86Launch4 ] };
-    key  <I32> {         [    XF86HomePage ] };
-    key  <I3C> {         [       XF86Music ] };
-    key  <I42> {         [     XF86Forward ] };
-    key  <I43> {         [        XF86Send ] };
-    key  <I57> {         [        XF86Save ] };
-    key  <I5F> {         [       XF86Sleep ] };
-    key  <I64> {         [    XF86Pictures ] };
-    key  <I67> {         [     XF86LaunchA ] };
-    key  <I6C> {         [        XF86Mail ] };
-    key  <I6D> {         [  XF86AudioMedia ] };
-    key  <I76> {         [      XF86iTouch ] };
-    key  <I77> {         [     XF86Launch3 ] };
-    key  <I79> {         [    XF86ToDoList ] };
-    key  <I7B> {         [  XF86Calculator ] };
- 
-    key  <K5A> {         [  XF86VendorHome ] };
-    key  <K5D> {         [        XF86Away ] };
-    key  <K5E> {         [      XF86WebCam ] };
-    key  <K5F> {         [     XF86Launch0 ] };
-    key  <K63> {         [     XF86Launch6 ] };
-    key  <K6D> {         [    XF86Calendar ] };
-    key  <K71> {         [     XF86LaunchB ] };
-    key  <K72> {         [     XF86LaunchC ] };
-    key  <K74> {         [         XF86WWW ] };
-    key  <K75> {         [     XF86LaunchE ] };
-
-    key <MDSW> {         [     XF86Launch1 ] };
-    key <NFER> {         [     XF86Launch2 ] };
-
-    key <XFER> {         [     XF86Launch8 ] };
-
 };
 
 // Intel
@@ -2234,3 +1784,30 @@ xkb_symbols "classmate" {
     key <I30>   {       [ XF86AudioRaiseVolume  ] };
 };
 
+// Unitek
+
+partial alphanumeric_keys
+xkb_symbols "unitekkb1925" {
+    include "inet(media_nav_common)"
+    key <I0C> { [ XF86AudioMute ] };
+    key <I11> { [ XF86PowerOff ] };
+    key <I12> { [ XF86Sleep ] };
+    key <I16> { [ XF86WakeUp ] };
+    key <I18> { [ XF86Search ] };
+    key <I1A> { [ XF86Reload ] };
+};
+
+// Compal
+
+// Compal FL90
+partial alphanumeric_keys
+xkb_symbols "compalfl90" {
+    include "inet(media_nav_acpi_common)"
+    key <I54>   {       [ XF86MonBrightnessUp   ]       };
+    key <II65>  {       [ XF86MonBrightnessDown ]       };
+};
+
+partial alphanumeric_keys
+xkb_symbols "pc105" {
+    include "inet(media_nav_acpi_common)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/it b/xorg-server/xkbdata.src/symbols/it
index 92fa50a87..e91a9f804 100644
--- a/xorg-server/xkbdata.src/symbols/it
+++ b/xorg-server/xkbdata.src/symbols/it
@@ -169,7 +169,7 @@ xkb_symbols "geo" {
 // OLPC Section
 xkb_symbols "olpc" {
 
-    include "basic"
+    include "it(basic)"
 
     key <AE12> { [ igrave,  asciicircum,    asciitilde,     dead_tilde ] };
     key <BKSL> { [ ugrave,      section,        Egrave,     dead_breve ] };
diff --git a/xorg-server/xkbdata.src/symbols/keypad b/xorg-server/xkbdata.src/symbols/keypad
index 9c56d0a82..fa2d72fbb 100644
--- a/xorg-server/xkbdata.src/symbols/keypad
+++ b/xorg-server/xkbdata.src/symbols/keypad
@@ -494,47 +494,87 @@ xkb_symbols "ossnumber_wang" {
     key <KP0>  { [ KP_Insert,   KP_0,   apostrophe, 0x1002195 ] }; // <insert> 0 ' ↕
 };
 
-// ATM/phone-style hexadecimal numpad
-// by Roland Kaufmann <rlndkfmn at gmail dot com>
-// License: BSD
-// Main numbers follows the traditions from ATMs and phones with
-// numbers increasing downwards to the right. (It is easier to
-// change the keyboard layout than to reprogram your local ATM;
-// also cell-phones are becoming more common while calculators are
-// becoming more rare).
-// Third-level gives the letters used in hexadecimal numbers, or
-// columns in small spreadsheets. Equal is added to start formulas
-// (most numpads don't have their own equal key), comma as a list
-// separator and colon to enter times and ranges.
+// Standard base "pc" layout only contains cursor keys, and then gets
+// augmented with the digits later. If you define your own layout for
+// the numpad you can inherit the cursors, but you'll have to define
+// the digits yourself. This module can be included in the rules to
+// define math operators; these are the variants used in computer
+// languages that are based on ASCII. NoSymbol doesn't mean that
+// nothing is bound to the key but that no assignment is done here.
+// srvr_ctrl(stdkeypad) and keypad(x11) declare the operator keys to
+// be of type CTRL+ALT in order to assign server control events to
+// them, but it uses the second level which is overwritten if we have
+// more than one definition (shift state) for the key. Instead, here
+// the commands are put at the fourth level.
 partial keypad_keys
-xkb_symbols "phone_hex" {
-    // NumLock, Enter
-    include "keypad(core)"
+xkb_symbols "ops" {
+    key <KPDV> { [ NoSymbol,  slash,     NoSymbol,  XF86_Ungrab     ] };
+    key <KPMU> { [ NoSymbol,  asterisk,  NoSymbol,  XF86_ClearGrab  ] };
+    key <KPSU> { [ NoSymbol,  minus,     NoSymbol,  XF86_Prev_VMode ] };
+    key <KPAD> { [ NoSymbol,  plus,      NoSymbol,  XF86_Next_VMode ] };
+    key <KPEQ> { [ NoSymbol,  equal      ] };
+};
 
+// Hexadecimal Numpad, by Roland Kaufmann <rlndkfmn at gmail dot com>
+// License: BSD (also covers variant with ATM digit order)
+// Third-level gives the letters used in hexadecimal numbers, or
+// columns in small spreadsheets. As a bonus, having 'e' available at
+// the center of the keyboard makes it easy to enter floating point
+// numbers in scientific notation.
+// Equal is added to start formulas (most numpads on PCs don't have
+// their own equal key), comma as a list separator (as most
+// programming languages wants period as a decimal separator) and
+// colon to enter times and ranges. Someone also may want to represent
+// multiplication and division in prose using x and colon.
+// Two first levels are specified as NoSymbol to not override any
+// previous specification. Combine this with another keypad specifier,
+// e.g. "legacy".
+partial keypad_keys
+xkb_symbols "hex" {
     key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
 
-    //             None          NumLock      AltGr
+    //             None       NumLock      AltGr
     // symbol row
-    key <KPDV> { [ KP_Divide,    slash,       parenleft  ] };
-    key <KPMU> { [ KP_Multiply,  asterisk,    parenright ] };
-    key <KPSU> { [ KP_Subtract,  minus,       dollar     ] };
+    key <KPDV> { [ NoSymbol,  NoSymbol,  parenleft  ] };
+    key <KPMU> { [ NoSymbol,  NoSymbol,  parenright ] };
+    key <KPSU> { [ NoSymbol,  NoSymbol,  dollar     ] };
 
     // upper row
-    key <KP7>  { [ KP_Home,      KP_1,        A          ] };
-    key <KP8>  { [ KP_Up,        KP_2,        B          ] };
-    key <KP9>  { [ KP_Prior,     KP_3,        C          ] };
+    key <KP7>  { [ NoSymbol,  NoSymbol,  a          ] };
+    key <KP8>  { [ NoSymbol,  NoSymbol,  b          ] };
+    key <KP9>  { [ NoSymbol,  NoSymbol,  c          ] };
  
     // home row
-    key <KP4>  { [ KP_Left,      KP_4,        D          ] };
-    key <KP5>  { [ KP_Begin,     KP_5,        E          ] };
-    key <KP6>  { [ KP_Right,     KP_6,        F          ] };
-    key <KPAD> { [ KP_Add,       plus,        comma      ] };
+    key <KP4>  { [ NoSymbol,  NoSymbol,  d          ] };
+    key <KP5>  { [ NoSymbol,  NoSymbol,  e          ] };
+    key <KP6>  { [ NoSymbol,  NoSymbol,  f          ] };
+    key <KPAD> { [ NoSymbol,  NoSymbol,  comma      ] };
 
     // lower row
-    key <KP1>  { [ KP_End,       KP_7,        equal      ] };
-    key <KP2>  { [ KP_Down,      KP_8,        x          ] };
-    key <KP3>  { [ KP_Next,      KP_9,        colon      ] };
+    key <KP1>  { [ NoSymbol,  NoSymbol,  equal      ] };
+    key <KP2>  { [ NoSymbol,  NoSymbol,  x          ] };
+    key <KP3>  { [ NoSymbol,  NoSymbol,  colon      ] };
 
     // decimal row
-    key <KP0>  { [ KP_Insert,    KP_0,        backslash  ] };
+    key <KP0>  { [ NoSymbol,  NoSymbol,  backslash  ] };
+};
+
+// Main numbers follows the traditions from ATMs and phones with
+// numbers increasing downwards to the right. (It is easier to
+// change the keyboard layout than to reprogram your local ATM;
+// also cell-phones are becoming more common while calculators are
+// becoming more rare).
+// First level is left unspecified, so it may be combined with another
+// layout, e.g. "legacy".
+partial keypad_keys
+xkb_symbols "atm" {
+    // upper row
+    key <KP7>  { [ NoSymbol,  KP_1 ] };
+    key <KP8>  { [ NoSymbol,  KP_2 ] };
+    key <KP9>  { [ NoSymbol,  KP_3 ] };
+
+    // lower row
+    key <KP1>  { [ NoSymbol,  KP_7 ] };
+    key <KP2>  { [ NoSymbol,  KP_8 ] };
+    key <KP3>  { [ NoSymbol,  KP_9 ] };
 };
diff --git a/xorg-server/xkbdata.src/symbols/kg b/xorg-server/xkbdata.src/symbols/kg
index 24f5a1516..be5424799 100644
--- a/xorg-server/xkbdata.src/symbols/kg
+++ b/xorg-server/xkbdata.src/symbols/kg
@@ -1,28 +1,135 @@
 // $XKeyboardConfig$
 
-// based on
-// russian standard keyboard
-// Yury Fedorov <yury-fedorov@prime-task.com>
-// Last Changes 2004/10/25 by Yury Fedorov <yury-fedorov@prime-task.com>
+// Kirghiz (aka Kyrgyz) Standard Keyboard
 //
-// $XFree86: xc/programs/xkbcomp/symbols/pc/kg,v 0.0 Exp $
+// Standard	 -	Phonetic
+// ______________- ________________
+// ё1234567890өң     ё1234567890яю
+// Ё!"№;%:?*()ӨҢ     Ё!"№;%:?-()ЯЮ
+//
+// йцукенгшщзхъү     өүертыуиопчшъ
+// фывапролджэ       асдфгңйклэь
+// ячсмитьбю.(,)     зхжвбнмцщ.(,)
 
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
+// Authors:
+// Timur Jamakeev <ztimur [at] gmail.com>
+// Ilyas Bakirov <just_ilyas [at] yahoo.com>
+// Yury Fedorov <yury-fedorov [at] prime-task.com>
+// Emil Asanov <a7 [at] on.kg>
+// Ulan Melisbek <ulan.melisbek [at] gmail.com>
 
-    include "ru(winkeys)"
 
-    name[Group1]= "Kyrgyzstan";
+// Kyrgyz standard keyboard
+partial default alphanumeric_keys
+xkb_symbols "basic" {
 
-    key.type[group1]="FOUR_LEVEL_ALPHABETIC";
+    name[Group1]= "Kyrgyzstan";
 
-    key	<AC07> { [ 	Cyrillic_o,		Cyrillic_O,		
-			Cyrillic_o_bar,  	Cyrillic_O_bar	] };
-    key	<AD03> { [ 	Cyrillic_u,		Cyrillic_U,
-			Cyrillic_u_straight,	Cyrillic_U_straight	] };
-    key	<AD06> { [ 	Cyrillic_en, 		Cyrillic_EN,	
-			Cyrillic_en_descender,	Cyrillic_EN_descender	] };		
+    key	<AE01> {	[		1,	    exclam 	]	};
+    key	<AE02> {	[		2,        quotedbl	]	};
+    key	<AE03> {	[		3,      numerosign	]	};
+    key	<AE04> {	[		4,       semicolon	]	};
+    key	<AE05> {	[		5,	   percent	]	};
+    key	<AE06> {	[		6,	     colon	]	};
+    key	<AE07> {	[		7,	  question	]	};
+    key	<AE08> {	[		8,	  asterisk	]	};
+    key	<AE09> {	[		9,	 parenleft	]	};
+    key	<AE10> {	[		0,	parenright	]	};
+    key	<AE11> {	[    Cyrillic_o_bar,  		Cyrillic_O_bar		]	};
+    key	<AE12> {	[    Cyrillic_en_descender,   	Cyrillic_EN_descender	]	};
+    key	<BKSL> {	[    Cyrillic_u_straight,  	Cyrillic_U_straight	]	};
+    key	<AB10> {	[	   period,	     comma	]	};
+    key <LSGT> {        [           slash,             bar      ]       };
 
-    include "level3(ralt_switch)"
+    key	<TLDE> {	[     Cyrillic_io,     Cyrillic_IO	]	};
+    key	<AD01> {	[ Cyrillic_shorti, Cyrillic_SHORTI	]	};
+    key	<AD02> {	[    Cyrillic_tse,    Cyrillic_TSE	]	};
+    key	<AD03> {	[      Cyrillic_u,	Cyrillic_U	]	};
+    key	<AD04> {	[     Cyrillic_ka,     Cyrillic_KA	]	};
+    key	<AD05> {	[     Cyrillic_ie,     Cyrillic_IE	]	};
+    key	<AD06> {	[     Cyrillic_en,     Cyrillic_EN	]	};
+    key	<AD07> {	[    Cyrillic_ghe,    Cyrillic_GHE	]	};
+    key	<AD08> {	[    Cyrillic_sha,    Cyrillic_SHA	]	};
+    key	<AD09> {	[  Cyrillic_shcha,  Cyrillic_SHCHA	]	};
+    key	<AD10> {	[     Cyrillic_ze,     Cyrillic_ZE	]	};
+    key	<AD11> {	[     Cyrillic_ha,     Cyrillic_HA	]	};
+    key	<AD12> {	[	Cyrillic_hardsign,	Cyrillic_HARDSIGN	]	};
+    key	<AC01> {	[     Cyrillic_ef,     Cyrillic_EF	]	};
+    key	<AC02> {	[   Cyrillic_yeru,   Cyrillic_YERU	]	};
+    key	<AC03> {	[     Cyrillic_ve,     Cyrillic_VE	]	};
+    key	<AC04> {	[      Cyrillic_a,	Cyrillic_A	]	};
+    key	<AC05> {	[     Cyrillic_pe,     Cyrillic_PE	]	};
+    key	<AC06> {	[     Cyrillic_er,     Cyrillic_ER	]	};
+    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O	]	};
+    key	<AC08> {	[     Cyrillic_el,     Cyrillic_EL	]	};
+    key	<AC09> {	[     Cyrillic_de,     Cyrillic_DE	]	};
+    key	<AC10> {	[    Cyrillic_zhe,    Cyrillic_ZHE	]	};
+    key	<AC11> {	[      Cyrillic_e,	Cyrillic_E	]	};
+    key	<AB01> {	[     Cyrillic_ya,     Cyrillic_YA	]	};
+    key	<AB02> {	[    Cyrillic_che,    Cyrillic_CHE	]	};
+    key	<AB03> {	[     Cyrillic_es,     Cyrillic_ES	]	};
+    key	<AB04> {	[     Cyrillic_em,     Cyrillic_EM	]	};
+    key	<AB05> {	[      Cyrillic_i,	Cyrillic_I	]	};
+    key	<AB06> {	[     Cyrillic_te,     Cyrillic_TE	]	};
+    key	<AB07> {	[ 	Cyrillic_softsign,	Cyrillic_SOFTSIGN	]	};
+    key	<AB08> {	[     Cyrillic_be,     Cyrillic_BE	]	};
+    key	<AB09> {	[     Cyrillic_yu,     Cyrillic_YU	]	};
 };
 
+// Kyrgyz phonetic layout
+partial alphanumeric_keys
+xkb_symbols "phonetic" {
+
+    name[Group1]="Kyrgyzstan - Phonetic";
+
+    key	<AE01> {	[		1,	    	exclam 			]	};
+    key	<AE02> {	[		2,        	quotedbl		]	};
+    key	<AE03> {	[		3,      	numerosign		]	};
+    key	<AE04> {	[		4,     	 	semicolon		]	};
+    key	<AE05> {	[		5,    	   	percent			]	};
+    key	<AE06> {	[		6, 	     	colon			]	};
+    key	<AE07> {	[		7,	  	question		]	};
+    key	<AE08> {	[		8,           	minus			]	};
+    key	<AE09> {	[		9,	 	parenleft		]	};
+    key	<AE10> {	[		0,		parenright		]	};
+    key	<AE11> {	[    	Cyrillic_ya,     	Cyrillic_YA		]	};
+    key	<AE12> {	[    	Cyrillic_yu,     	Cyrillic_YU		]	};
+
+    key	<AD11> {	[    	Cyrillic_che,		Cyrillic_CHE		]	};
+    key	<AD12> {	[    	Cyrillic_sha,    	Cyrillic_SHA		]	};
+    key	<BKSL> {	[	Cyrillic_hardsign, 	Cyrillic_HARDSIGN	]	};
+    key	<AB09> {	[    	Cyrillic_shcha,    	Cyrillic_SHCHA		]	};
+    key	<AB10> {	[      	period, 		comma			]	};
+    key	<AB08> {	[	Cyrillic_tse, 		Cyrillic_TSE		]	};
+    key	<AC10> {	[	Cyrillic_e,        	Cyrillic_E		]	};
+    key	<AC11> {	[	Cyrillic_softsign, 	Cyrillic_SOFTSIGN	]	};
+    key	<TLDE> {	[     	Cyrillic_io,     	Cyrillic_IO		]	};
+
+    key	<LatQ> {	[     	Cyrillic_o_bar,  	Cyrillic_O_bar		]	};
+    key	<LatZ> {	[     	Cyrillic_ze,     	Cyrillic_ZE		]	};
+    key	<LatS> {	[     	Cyrillic_es,     	Cyrillic_ES		]	};
+    key	<LatA> {	[     	Cyrillic_a,		Cyrillic_A		]	};
+    key	<LatW> {	[     	Cyrillic_u_straight,  	Cyrillic_U_straight	]	};
+    key	<LatC> {	[     	Cyrillic_zhe,    	Cyrillic_ZHE		]	};
+    key	<LatX> {	[	Cyrillic_ha,     	Cyrillic_HA 		]	};
+    key	<LatD> {	[     	Cyrillic_de,		Cyrillic_DE		]	};
+    key	<LatE> {	[     	Cyrillic_ie,     	Cyrillic_IE		]	};
+    key	<LatV> {	[     	Cyrillic_ve,     	Cyrillic_VE		]	};
+    key	<LatF> {	[     	Cyrillic_ef,     	Cyrillic_EF		]	};
+    key	<LatT> {	[     	Cyrillic_te,     	Cyrillic_TE		]	};
+    key	<LatR> {	[     	Cyrillic_er,     	Cyrillic_ER		]	};
+    key	<LatN> {	[     	Cyrillic_en,     	Cyrillic_EN		]	};
+    key	<LatB> {	[     	Cyrillic_be,     	Cyrillic_BE		]	};
+    key	<LatH> {	[     	Cyrillic_en_descender,  Cyrillic_EN_descender	]	};
+    key	<LatG> {	[    	Cyrillic_ghe,    	Cyrillic_GHE		]	};
+    key	<LatY> {	[   	Cyrillic_yeru,   	Cyrillic_YERU		]	};
+    key	<LatM> {	[     	Cyrillic_em,     	Cyrillic_EM		]	};
+    key	<LatJ> {	[ 	Cyrillic_shorti, 	Cyrillic_SHORTI		]	};
+    key	<LatU> {	[      	Cyrillic_u,		Cyrillic_U		]	};
+    key	<LatK> {	[     	Cyrillic_ka,     	Cyrillic_KA		]	};
+    key	<LatI> {	[      	Cyrillic_i,		Cyrillic_I		]	};
+    key	<LatO> {	[      	Cyrillic_o,		Cyrillic_O		]	};
+    key	<LatL> {	[     	Cyrillic_el,     	Cyrillic_EL		]	};
+    key	<LatP> {	[     	Cyrillic_pe,     	Cyrillic_PE		]	};
+
+};
diff --git a/xorg-server/xkbdata.src/symbols/kpdl b/xorg-server/xkbdata.src/symbols/kpdl
index ffcfcd9f0..a8bdfb7f9 100644
--- a/xorg-server/xkbdata.src/symbols/kpdl
+++ b/xorg-server/xkbdata.src/symbols/kpdl
@@ -86,3 +86,20 @@ xkb_symbols "kposs" {
 
     key <KPDL> { [ KP_Delete, KP_Decimal, KP_Separator, 0x100202F ] }; // <delete> ? ? ⍽ (narrow no-break space)
 };
+
+// Spreadsheets may be configured to use the dot as decimal
+// punctuation, comma as a thousands separator and then semi-colon as
+// the list separator. Of these, dot and semi-colon is most important
+// when entering data by the keyboard; the comma can then be inferred
+// and added to the presentation afterwards. Using semi-colon as a
+// general separator may in fact be preferred to avoid ambiguities
+// in data files. Most times a decimal separator is hard-coded, it
+// seems to be period, probably since this is the syntax used in
+// (most) programming languages.
+partial keypad_keys
+xkb_symbols "semi" {
+
+    key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
+
+    key <KPDL> { [ NoSymbol, NoSymbol, semicolon ] };
+};
diff --git a/xorg-server/xkbdata.src/symbols/kr b/xorg-server/xkbdata.src/symbols/kr
index 10de5fef5..4c2fa9673 100644
--- a/xorg-server/xkbdata.src/symbols/kr
+++ b/xorg-server/xkbdata.src/symbols/kr
@@ -3,15 +3,15 @@
 
 default  alphanumeric_keys
 xkb_symbols "kr106" {
-    name[Group1]= "Korea, Republic of";
     include "us"
+    name[Group1]= "Korea, Republic of";
     include "kr(koreankeys)"
 };
 
 alphanumeric_keys
 xkb_symbols "kr104" {
-    name[Group1]= "Korea, Republic of - 101/104 key Compatible";
     include "us"
+    name[Group1]= "Korea, Republic of - 101/104 key Compatible";
     include "kr(koreankeys)"
     include "kr(koreankeys_raltctl)"
 };
diff --git a/xorg-server/xkbdata.src/symbols/latam b/xorg-server/xkbdata.src/symbols/latam
index 02372d8b9..29ec743dc 100644
--- a/xorg-server/xkbdata.src/symbols/latam
+++ b/xorg-server/xkbdata.src/symbols/latam
@@ -61,3 +61,12 @@ xkb_symbols "nodeadkeys" {
     key <AB10>	{ [     minus, underscore, dead_belowdot,    abovedot ]	};
 };
 
+partial alphanumeric_keys
+xkb_symbols "deadtilde" {
+
+    include "latam(basic)"
+
+    name[Group1]="Latin American - Include dead tilde";
+
+    key <AD12>	{ [      plus,   asterisk,   dead_tilde,  dead_macron ]	};
+};
diff --git a/xorg-server/xkbdata.src/symbols/level3 b/xorg-server/xkbdata.src/symbols/level3
index d4e112913..79fdcea03 100644
--- a/xorg-server/xkbdata.src/symbols/level3
+++ b/xorg-server/xkbdata.src/symbols/level3
@@ -136,7 +136,7 @@ xkb_symbols "rwin_switch" {
 // using the level3(enter_switch) map, the Enter key on the keypad
 // temporarily chooses the third shift level.  This is especially
 // useful for Mac laptops which miss the right Alt key.
-partial hidden modifier_keys
+partial modifier_keys
 xkb_symbols "enter_switch" {
   key <KPEN> {
     type[Group1]="ONE_LEVEL",
diff --git a/xorg-server/xkbdata.src/symbols/lt b/xorg-server/xkbdata.src/symbols/lt
index 6e7a43c7e..d535da7d3 100644
--- a/xorg-server/xkbdata.src/symbols/lt
+++ b/xorg-server/xkbdata.src/symbols/lt
@@ -110,6 +110,8 @@ xkb_symbols "std" {
 
     key	<LSGT> {[	less,		greater,	endash		]};
 
+    include "kpdl(comma)"
+
     include "level3(ralt_switch)"
 };
 
@@ -158,11 +160,16 @@ xkb_symbols "ibm" {
     include "level3(ralt_switch)"
 };
 
-
-
 // LEKP, LEKPa and Baltic+ layouts 1.0 for Linux.
 // Copyright (c) 2007 Tautrimas Pajarskas
 // For more info go to http://lekp.info
+//
+// LEKP and LEKPa layouts are licensed under the Creative Commons
+// Attribution-Noncommercial-Share Alike 3.0 License.
+// To view a copy of this license, visit
+// http://creativecommons.org/licenses/by-nc-sa/3.0/ or send
+// a letter to Creative Commons, 171 Second Street, Suite 300,
+// San Francisco, California, 94105, USA.
 
 partial alphanumeric_keys modifier_keys
 xkb_symbols "lekp" {
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.in
index 90b2eb576..801f8ab0d 100644
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -57,8 +53,6 @@ DATA = $(dist_symbols_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -160,6 +131,7 @@ am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build_alias = @build_alias@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 xkb_base = @xkb_base@
 xkb_rules_symlink = @xkb_rules_symlink@
 symbolsdir = $(xkb_base)/symbols/macintosh_vndr
@@ -202,8 +178,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -227,10 +203,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
 install-dist_symbolsDATA: $(dist_symbols_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+	test -z "$(symbolsdir)" || $(MKDIR_P) "$(DESTDIR)$(symbolsdir)"
 	@list='$(dist_symbols_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -253,22 +228,21 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -284,7 +258,7 @@ check: check-am
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(symbolsdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -330,12 +304,20 @@ info-am:
 
 install-data-am: install-dist_symbolsDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -354,17 +336,21 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dist_symbolsDATA uninstall-info-am
+uninstall-am: uninstall-dist_symbolsDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-dist_symbolsDATA install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-dist_symbolsDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_symbolsDATA uninstall-info-am
+	uninstall-dist_symbolsDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/xkbdata.src/symbols/nec_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/nec_vndr/Makefile.in
index 30b4c87c1..6f96e6797 100644
--- a/xorg-server/xkbdata.src/symbols/nec_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/nec_vndr/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -57,8 +53,6 @@ DATA = $(dist_symbols_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -160,6 +131,7 @@ am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build_alias = @build_alias@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 xkb_base = @xkb_base@
 xkb_rules_symlink = @xkb_rules_symlink@
 symbolsdir = $(xkb_base)/symbols/nec_vndr
@@ -198,8 +174,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -223,10 +199,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
 install-dist_symbolsDATA: $(dist_symbols_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+	test -z "$(symbolsdir)" || $(MKDIR_P) "$(DESTDIR)$(symbolsdir)"
 	@list='$(dist_symbols_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -249,22 +224,21 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -280,7 +254,7 @@ check: check-am
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(symbolsdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -326,12 +300,20 @@ info-am:
 
 install-data-am: install-dist_symbolsDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -350,17 +332,21 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dist_symbolsDATA uninstall-info-am
+uninstall-am: uninstall-dist_symbolsDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-dist_symbolsDATA install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-dist_symbolsDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_symbolsDATA uninstall-info-am
+	uninstall-dist_symbolsDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/xkbdata.src/symbols/pc b/xorg-server/xkbdata.src/symbols/pc
index 444e3c1ac..9f3da6640 100644
--- a/xorg-server/xkbdata.src/symbols/pc
+++ b/xorg-server/xkbdata.src/symbols/pc
@@ -19,10 +19,7 @@ xkb_symbols "pc105" {
     include "pc(editing)"
     include "keypad(x11)"
 
-    key <BKSP> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ BackSpace,   Terminate_Server ]
-    };
+    key <BKSP> {	[ BackSpace	]	};
 
     key  <TAB> {	[ Tab,	ISO_Left_Tab	]	};
     key <RTRN> {	[ Return	]	};
@@ -35,11 +32,13 @@ xkb_symbols "pc105" {
     key <LCTL> {	[ Control_L	]	};
 
     key <LWIN> {	[ Super_L			]	};
+    modifier_map Mod4   { <LWIN> };
 
     key <RTSH> {	[ Shift_R	]	};
     key <RCTL> {	[ Control_R	]	};
 
     key <RWIN> {	[ Super_R			]	};
+    modifier_map Mod4   { <RWIN> };
 
     key <MENU> {	[ Menu			]	};
 
diff --git a/xorg-server/xkbdata.src/symbols/pk b/xorg-server/xkbdata.src/symbols/pk
index 43ee86241..320e1c2a7 100644
--- a/xorg-server/xkbdata.src/symbols/pk
+++ b/xorg-server/xkbdata.src/symbols/pk
@@ -7,81 +7,197 @@
 //Notice:
 //Alt key combinations are yet to be put in. The unavailable keys are those which do not have a corresponding //glyph in unicode.
 
+// based on a keyboard map from an 'xkb/symbols/ur' file
+// $XFree86$
+
 partial default alphanumeric_keys
-xkb_symbols "urd" {
+xkb_symbols "urd-phonetic" {
+
    name[Group1]= "Pakistan";
 
-   // Keys '~' - '='
-   //  All keys checked and complete
-   key <TLDE> {  [ 0x10006d4 ] };
-   key <AE01> {  [ 0x1000661, exclam ] };
-   key <AE02> {  [ 0x1000662, 0x1000040 ] };
-   key <AE03> {  [ 0x1000663, 0x1000023 ] };
-   key <AE04> {  [ 0x10006f4, 0x1000024 ] };
-   key <AE05> {  [ 0x10006f5, 0x1000025 ] };
-   key <AE06> {  [ 0x1000666, 0x100005e ] };
-   key <AE07> {  [ 0x1000667, 0x1000026 ] };
-   key <AE08> {  [ 0x1000668, asterisk ] };
-   key <AE09> {  [ 0x1000669, parenleft ] };
-   key <AE10> {  [ 0x1000660, parenright ] };
-   key <AE11> {  [ minus, 0x100005f ] };
-   key <AE12> {  [ equal, plus ] };
+   key <TLDE> {  [     0x100064b  ,       0x100007E, 0x100200C     ]     };
+   key <AE01> {  [     0x1000031  ,       0x1000021      ]     };
+   key <AE02> {  [     0x1000032  ,       0x1000040      ]     };
+   key <AE03> {  [     0x1000033  ,       0x1000023      ]     };
+   key <AE04> {  [     0x1000034  ,       0x1000024      ]     };
+   key <AE05> {  [     0x1000035  ,       0x1000025      ]     };
+   key <AE06> {  [     0x1000036  ,       0x100005E      ]     };
+   key <AE07> {  [     0x1000037  ,       0x1000026      ]     };
+   key <AE08> {  [     0x1000038  ,       0x100002A      ]     };
+   key <AE09> {  [     0x1000039  ,       0x1000029      ]     };
+   key <AE10> {  [     0x1000030  ,       0x1000028      ]     };
+   key <AE11> {  [     0x100002D  ,       0x100005F      ]     };
+   key <AE12> {  [     0x100003D  ,       0x100002B      ]     };
+   key <AD01> {  [     0x1000642  ,       0x1000652, 0x100200D     ]     };
+   key <AD02> {  [     0x1000648  ,       0x1000624, 0x100200C     ]     };
+   key <AD03> {  [     0x1000639  ,       0x1000670      ]     };
+   key <AD04> {  [     0x1000631  ,       0x1000691      ]     };
+   key <AD05> {  [     0x100062a  ,       0x1000679      ]     };
+   key <AD06> {  [     0x10006d2  ,       0x100064E      ]     };
+   key <AD07> {  [     0x1000621  ,       0x1000626      ]     };
+   key <AD08> {  [     0x10006cc  ,       0x1000650      ]     };
+   key <AD09> {  [     0x10006c1  ,       0x10006c3      ]     };
+   key <AD10> {  [     0x100067e  ,       0x100064f      ]     };
+   key <AD11> {  [     0x100005d  ,       0x100007D      ]     };
+   key <AD12> {  [     0x100005b  ,       0x100007B      ]     };
 
-   //Keys 'Q' - ']'
-   //Checked but incomplete with three shift sequences not available
-   key <AD01> {  [  Arabic_qaf, 0x10006e1 ] };
-   key <AD02> {  [  0x1000648, 0x100fdf9  ] }; //shift key not available
-   key <AD03> {  [  0x1000639, 0x100fdf7  ] }; //shift key not available
-   key <AD04> {  [  0x1000631, 0x1000691  ] };
-   key <AD05> {  [  Arabic_teh, 0x1000679  ] };
-   key <AD06> {  [  0x10006d2, 0x100fe7c  ] };
-   key <AD07> {  [  0x1000621,  0x100064c ] };
-   key <AD08> {  [  0x10006cc, 0x1000656  ] }; //shift key not available
-   key <AD09> {  [  0x1000647, 0x1000629  ] };
-   key <AD10> {  [  0x100067e, 0x100064f  ] };
-   key <AD12> {  [  bracketright, braceright  ] };
-   key <AD11> {  [  bracketleft, braceleft  ] };
+   key <AC01> {  [     0x1000627  ,       0x1000622    ]     };
+   key <AC02> {  [     0x1000633  ,       0x1000635      ]     };
+   key <AC03> {  [     0x100062f  ,       0x1000688      ]     };
+   key <AC04> {  [     0x1000641  ,       0x1000651  ]     };
+   key <AC05> {  [     0x10006af  ,       0x100063a      ]     };
+   key <AC06> {  [     0x100062D,       0x10006BE      ]     };
+   key <AC07> {  [     0x100062c  ,       0x1000636      ]     };
+   key <AC08> {  [     0x10006a9  ,       0x100062e      ]     };
+   key <AC09> {  [     0x1000644  ,       0x1000654 ]     };
+   key <AC10> {  [     0x100061b  ,       0x100003a      ]     };
+   key <AC11> {  [     0x1000027  ,       0x1000022       ]     };
+   key <BKSL> {  [     0x100005C,        0x100007C      ]     };
 
+   key <LSGT> {  [            bar ,       brokenbar      ]     };
+   key <AB01> {  [     0x1000632  ,       0x1000630, 0x100200E    ]     };
+   key <AB02> {  [     0x1000634  ,       0x1000698, 0x100202A      ]     };
+   key <AB03> {  [     0x1000686  ,       0x100062b, 0x100202D     ]     };
+   key <AB04> {  [     0x1000637  ,       0x1000638, 0x100202C      ]     };
+   key <AB05> {  [     0x1000628  ,       0x100002e, 0x100202E      ]     };
+   key <AB06> {  [     0x1000646  ,       0x10006ba, 0x100202B      ]     };
+   key <AB07> {  [     0x1000645  ,       0x1000658, 0x100200F     ]     };
+   key <AB08> {  [     0x100060c  ,       0x100003c      ]     };
+   key <AB09> {  [     0x10006d4  ,       0x100003E      ]     };
+   key <AB10> {  [     0x100002f  ,       0x100061f      ]     };
 
-   // Keys 'A' - '''
-   // Checked but incomplete with two shift sequences not available
-   key <AC01> { [  0x1000627, 0x1000622  ] };
-   key <AC02> { [  Arabic_seen, 0x1000635  ] };
-   key <AC03> { [  0x100062f, 0x1000688  ] };
-   key <AC04> { [  0x1000641, 0x1000670  ] };
-   key <AC05> { [  0x10006af, 0x100063a  ] };
-   key <AC06> { [  0x10006be, 0x100062d ] };
-   key <AC07> { [  0x100062c, 0x1000636  ] };
-   key <AC08> { [  0x10006a9,  0x100062e  ] };
-   key <AC09> { [  0x1000644, 0x1000612 ] };//shift key not available
-   key <AC10> { [  0x100061b, 0x100003a  ] };
-   key <AC11> { [  0x1000027  ] }; // shift key not available
-
-
-   // These two are fine
-   key <BKSL> { [  backslash, bar  ] };
-   key <SPCE> { [  space  ] };
+//   key <RALT> {  [ Mode_switch, Multi_key ] };
 
+   include "level3(ralt_switch)"
 
-   // Keys: 'Z' - '/'
-   //Keys checked with two shift sequences not available
-   key <AB01> { [  Arabic_zain, Arabic_thal  ] };
-   key <AB02> {  [  0x1000634, 0x1000698  ] };
-   key <AB03> {  [ 0x1000686 , 0x100062b  ] };
-   key <AB04> {  [  0x1000637, 0x1000638  ] };
-   key <AB05> {  [  0x1000628, 0x1000628  ] };//shift key unavailable
-   key <AB06> {  [  0x1000646, 0x10006ba  ] };
-   key <AB07> {  [  0x1000645, 0x1000645  ] };//shift key not available
-   key <AB08> {  [  0x100060c, 0x100064e  ] };
-   key <AB09> {  [  0x10006d4, 0x1000650  ] };
-   key <AB10> {  [  slash, Arabic_question_mark  ] };
-
-   //End alphanumeric key mappings
-
-   //Begin modifier mappings
-
-   modifier_map Shift {Shift_L, Shift_R };
-   modifier_map Lock {Caps_Lock };
+   // End alphanumeric section
+};
+
+partial alphanumeric_keys
+xkb_symbols "urd-crulp" {
+
+   name[Group1]= "Pakistan - CRULP";
+// www.crulp.org phonetic v1.1
+
+   key <TLDE> {  [     0x100007E  ,       0x100064B      ]     };
+   key <AE01> {  [     0x10006F1  ,       0x1000031, 0x1000021   ]     };
+   key <AE02> {  [     0x10006F2  ,       0x1000032, 0x1000040      ]     };
+   key <AE03> {  [     0x10006F3  ,       0x1000033, 0x1000023      ]     };
+   key <AE04> {  [     0x10006F4  ,       0x1000034      ]     };
+   key <AE05> {  [     0x10006F5  ,       0x1000035, 0x100066A      ]     };
+   key <AE06> {  [     0x10006F6  ,       0x1000036     ]     };
+   key <AE07> {  [     0x10006F7  ,       0x1000037, 0x1000026       ]     };
+   key <AE08> {  [     0x10006F8  ,       0x1000038, 0x100002A      ]     };
+   key <AE09> {  [     0x10006F9  ,       0x1000039, 0x1000029      ]     };
+   key <AE10> {  [     0x10006F0  ,       0x1000030, 0x1000028      ]     };
+   key <AE11> {  [     0x100002D  ,       0x100005F 	     ]     };
+   key <AE12> {  [     0x100003D  ,       0x100002B      ]     };   
+   key <AD01> {  [     0x1000642  ,       0x1000652  ]     };
+   key <AD02> {  [     0x1000648  ,       0x1000651, 0x1000602    ]     };
+   key <AD03> {  [     0x1000639  ,       0x1000670, 0x1000656      ]     };
+   key <AD04> {  [     0x1000631  ,       0x1000691, 0x1000613      ]     };
+   key <AD05> {  [     0x100062a  ,       0x1000679, 0x1000614      ]     };
+   key <AD06> {  [     0x10006d2  ,       0x100064E, 0x1000601      ]     };
+   key <AD07> {  [     0x1000621  ,       0x1000626, 0x1000654      ]     };
+   key <AD08> {  [     0x10006cc  ,       0x1000650,  0x1000611      ]     };
+   key <AD09> {  [     0x10006c1  ,       0x10006c3      ]     };
+   key <AD10> {  [     0x100067e  ,       0x100064f,  0x1000657      ]     };
+   key <AD11> {  [     0x100005d  ,       0x100007D      ]     };
+   key <AD12> {  [     0x100005b  ,       0x100007B      ]     };
+
+   key <AC01> {  [     0x1000627  ,       0x1000622, 0x100FDF2    ]     };
+   key <AC02> {  [     0x1000633  ,       0x1000635, 0x1000610    ]     };
+   key <AC03> {  [     0x100062f  ,       0x1000688, 0x100FDFA     ]     };
+   key <AC04> {  [     0x1000641  ,       0x1000651  ]     };
+   key <AC05> {  [     0x10006af  ,       0x100063a      ]     };
+   key <AC06> {  [     0x100062D,       0x10006BE, 0x1000612      ]     };
+   key <AC07> {  [     0x100062c  ,       0x1000636, 0x100FDFB      ]     };
+   key <AC08> {  [     0x10006a9  ,       0x100062e      ]     };
+   key <AC09> {  [     0x1000644  ,       0x1000654 ]     };
+   key <AC10> {  [     0x100061b  ,       0x100003a      ]     };
+   key <AC11> {  [     0x1000027  ,       0x1000022       ]     };
+   key <BKSL> {  [     0x100005C,        0x100007C      ]     };
+
+   key <LSGT> {  [            bar ,       brokenbar      ]     };
+   key <AB01> {  [     0x1000632  ,       0x1000630, 0x100060F    ]     };
+   key <AB02> {  [     0x1000634  ,       0x1000698, 0x100060E      ]     };
+   key <AB03> {  [     0x1000686  ,       0x100062b, 0x1000603	     ]     };
+   key <AB04> {  [     0x1000637  ,       0x1000638      ]     };
+   key <AB05> {  [     0x1000628  ,       0x100002e, 0x100FDFD	      ]     };
+   key <AB06> {  [     0x1000646  ,       0x10006ba, 0x1000600	      ]     };
+   key <AB07> {  [     0x1000645  ,       0x1000658    ]     };
+   key <AB08> {  [     0x100060c  ,       0x100003c, 0x100003C      ]     };
+   key <AB09> {  [     0x10006d4  ,       0x100066B, 0x100003E      ]     };
+   key <AB10> {  [     0x100002f   ,       0x100061F      ]     };
+
+//   key <RALT> {  [ Mode_switch, Multi_key ] };
+
+   include "level3(ralt_switch)"
+
+   // End alphanumeric section
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "urd-nla" {
+   name[Group1]= "Pakistan - NLA";
+// www.nla.gov.pk
+
+   key <TLDE> {  [     0x1000060  ,       0x100007E, 0x100200C     ]     };
+   key <AE01> {  [     0x1000031  ,       0x1000021      ]     };
+   key <AE02> {  [     0x1000032  ,       0x1000040      ]     };
+   key <AE03> {  [     0x1000033  ,       0x1000023      ]     };
+   key <AE04> {  [     0x1000034  ,       0x1000024      ]     };
+   key <AE05> {  [     0x1000035  ,       0x100066A      ]     };
+   key <AE06> {  [     0x1000036  ,       0x100005E      ]     };
+   key <AE07> {  [     0x1000037  ,       0x10006D6      ]     };
+   key <AE08> {  [     0x1000038  ,       0x100066D      ]     };
+   key <AE09> {  [     0x1000039  ,       0x1000029      ]     };
+   key <AE10> {  [     0x1000030  ,       0x1000028      ]     };
+   key <AE11> {  [     0x100002D ,        0x100005F      ]     };
+   key <AE12> {  [     0x100003D  ,       0x100002B      ]     };
+   key <AD01> {  [     0x1000637  ,       0x1000638, 0x100200D      ]     };
+   key <AD02> {  [     0x1000635  ,       0x1000636, 0x100200C     ]     };
+   key <AD03> {  [     0x10006BE  ,       0x1000630      ]     };
+   key <AD04> {  [     0x100062F ,        0x1000688     ]     };
+   key <AD05> {  [     0x1000679  ,       0x100062B      ]     };
+   key <AD06> {  [     0x100067E  ,       0x1000651      ]     };
+   key <AD07> {  [     0x100062A  ,       0x10006C3      ]     };
+   key <AD08> {  [     0x1000628  ,       0x1000640      ]     };
+   key <AD09> {  [     0x100062C  ,       0x1000686      ]     };
+   key <AD10> {  [     0x100062D  ,       0x100062E      ]     };
+   key <AD11> {  [     0x100005d  ,       0x100007D      ]     };
+   key <AD12> {  [     0x100005b  ,       0x100007B      ]     };
+
+   key <AC01> {  [     0x1000645  ,       0x1000698      ]     };
+   key <AC02> {  [     0x1000648  ,       0x1000632      ]     };
+   key <AC03> {  [     0x1000631  ,       0x1000691      ]     };
+   key <AC04> {  [     0x1000646  ,       0x10006BA      ]     };
+   key <AC05> {  [     0x1000644  ,       0x10006C2      ]     };
+   key <AC06> {  [     0x10006C1  ,       0x1000621      ]     };
+   key <AC07> {  [     0x1000627  ,       0x1000622      ]     };
+   key <AC08> {  [     0x10006a9  ,       0x10006AF      ]     };
+   key <AC09> {  [     0x10006CC  ,       0x100064A      ]     };
+   key <AC10> {  [     0x100061b  ,       0x100003a      ]     };
+   key <AC11> {  [     0x1000027  ,       0x1000022       ]     };
+   key <BKSL> {  [     0x100005C ,        0x100007C      ]     };
+
+   key <LSGT> {  [            bar ,       brokenbar      ]     };
+   key <AB01> {  [     0x1000642  ,       0x100200D, 0x100200E     ]     };
+   key <AB02> {  [     0x1000641  ,       0x100200C, 0x100202A      ]     };
+   key <AB03> {  [     0x10006D2  ,       0x10006D3, 0x100202D     ]     };
+   key <AB04> {  [     0x1000633  ,       0x100200E, 0x100202C      ]     };
+   key <AB05> {  [     0x1000634  ,       0x1000624, 0x100202E      ]     };
+   key <AB06> {  [     0x100063A  ,       0x1000626, 0x100202B      ]     };
+   key <AB07> {  [     0x1000639  ,       0x100200F, 0x100200F      ]     };
+   key <AB08> {  [     0x100060c  ,       0x100003E      ]     };
+   key <AB09> {  [     0x10006d4  ,       0x100003C      ]     };
+   key <AB10> {  [     0x100002F  ,       0x100061f      ]     };
+
+   
+   include "level3(ralt_switch)"
+
+   // End alphanumeric section
 };
 
 partial alphanumeric_keys
diff --git a/xorg-server/xkbdata.src/symbols/pl b/xorg-server/xkbdata.src/symbols/pl
index 58b96e5dc..6eb8b1c56 100644
--- a/xorg-server/xkbdata.src/symbols/pl
+++ b/xorg-server/xkbdata.src/symbols/pl
@@ -11,11 +11,14 @@ xkb_symbols "basic" {
 
     name[Group1]="Poland";
 
+    key <AD01>  { [         q,          Q ] };
+    key <AD02>  { [         w,          W ] };
     key <AD03>	{ [         e,          E,      eogonek,      Eogonek ]	};
     key <AD09>	{ [         o,          O,       oacute,       Oacute ]	};
 
     key <AC01>	{ [         a,          A,      aogonek,      Aogonek ]	};
     key <AC02>	{ [         s,          S,       sacute,       Sacute ]	};
+    key <AC04>  { [         f,          F ] };
 
     key <AB01>	{ [         z,          Z,    zabovedot,    Zabovedot ]	};
     key <AB02>	{ [         x,          X,       zacute,       Zacute ]	};
@@ -50,12 +53,15 @@ xkb_symbols "qwertz" {
     key <AE11>	{ [      plus,   question, dead_diaeresis, questiondown ] };
     key <AE12>	{ [apostrophe,   asterisk, dead_cedilla,  dead_ogonek ]	};
 
+    key <AD01>  { [         q,          Q ] };
+    key <AD02>  { [         w,          W ] };
     key <AD03>	{ [         e,          E,     EuroSign,         cent ]	};
     key <AD11>	{ [ zabovedot,     nacute,     division, dead_abovering ] };
     key <AD12>	{ [    sacute,     cacute,     multiply,  dead_macron ]	};
 
     key <AC02>	{ [         s,          S,      dstroke,      section ]	};
     key <AC03>	{ [         d,          D,      Dstroke,          ETH ]	};
+    key <AC04>  { [         f,          F ] };
     key <AC08>	{ [         k,          K,          kra,    ampersand ]	};
     key <AC09>	{ [         l,          L,      lstroke,      Lstroke ]	};
     key <AC10>	{ [   lstroke,    Lstroke,       dollar, dead_doubleacute ] };
@@ -124,7 +130,7 @@ partial alphanumeric_keys
 xkb_symbols "dvorak_altquotes" {
     include "pl(dvorak)"
 
-    name[Group1] = "Poland - Dvorak, Polish quotes on key 1/!";
+    name[Group1] = "Poland - Dvorak, Polish quotes on key 1";
 
     key <AE01> { [	    1,	exclam, doublelowquotemark, rightdoublequotemark	]	};
 };
@@ -136,6 +142,8 @@ xkb_symbols "csb" {
 
     name[Group1]="Poland - Kashubian";
 
+    key <AD01>  { [         q,          Q ] };
+    key <AD02>  { [         w,          W ] };
     key <AD03>	{ [         e,          E,      eacute,      Eacute ]	};
     key <AD04>	{ [         r,           R,      ediaeresis,      Ediaeresis ]	};
     key <AD06>      { [         y,          Y,      EuroSign,         cent ]        };
@@ -146,6 +154,7 @@ xkb_symbols "csb" {
 
     key <AC01>	{ [         a,          A,      aogonek,      Aogonek ]	};
     key <AC02>	{ [         s,          S,      atilde,      Atilde ]	      };
+    key <AC04>  { [         f,          F ] };
     key <AC09>	{ [         l,          L,      lstroke,      Lstroke ]      };
 
     key <AB01>	{ [         z,          Z,    zabovedot,    Zabovedot ]	};
diff --git a/xorg-server/xkbdata.src/symbols/ro b/xorg-server/xkbdata.src/symbols/ro
index e4ed70585..b2842bd79 100644
--- a/xorg-server/xkbdata.src/symbols/ro
+++ b/xorg-server/xkbdata.src/symbols/ro
@@ -193,3 +193,43 @@ xkb_symbols "winkeys" {
     include "level3(ralt_switch)"
 
 };
+
+// Crimean Tatar (Crimean Turkish) layouts.
+partial
+xkb_symbols "crh_f" {
+    include "tr(crh_f)"
+
+    name[Group1]="Romania - Crimean Tatar (Turkish F)";
+};
+
+partial
+xkb_symbols "crh_alt" {
+    include "tr(crh_alt)"
+
+    name[Group1]="Romania - Crimean Tatar (Turkish Alt-Q)";
+};
+
+partial
+xkb_symbols "crh_dobruca1" {
+    include "tr(crh)"
+
+    name[Group1]="Romania - Crimean Tatar (Dobruca-1 Q)";
+
+    key <AD05>	{ [         t,          T,       tcedilla,       Tcedilla ]	};
+    key <AD10>	{ [         p,          P,         abreve,         Abreve ]	};
+
+    key <AC04>	{ [         f,          F,         ibreve,         Ibreve ]	};
+    key <AC07>	{ [    iacute,     Iacute,              j,              J ]	};
+
+    key <AB07>	{ [         m,          M,      trademark,      masculine ]	};
+};
+
+partial
+xkb_symbols "crh_dobruca2" {
+    include "ro(crh_dobruca1)"
+
+    name[Group1]="Romania - Crimean Tatar (Dobruca-2 Q)";
+
+    key <AC04>	{ [         f,          F,          iacute,          Iacute ]	};
+    key <AC07>	{ [    ibreve,     Ibreve,               j,               J ]	};
+};
diff --git a/xorg-server/xkbdata.src/symbols/rs b/xorg-server/xkbdata.src/symbols/rs
index 673b143fb..b34e0dd06 100644
--- a/xorg-server/xkbdata.src/symbols/rs
+++ b/xorg-server/xkbdata.src/symbols/rs
@@ -19,7 +19,7 @@ xkb_symbols "basic" {
 
   name[Group1]= "Serbia";
 
-  include "rs(level3)"
+  include "rs(cyrlevel3)"
   include "rs(common)"
   include "rs(cyralpha)"
   include "level3(ralt_switch)"
@@ -33,7 +33,7 @@ xkb_symbols "latin" {
 
   include "latin(type3)"
   include "rs(latalpha)"
-  include "rs(level3)"
+  include "rs(latlevel3)"
   include "rs(common)"
   include "level3(ralt_switch)"
 };
@@ -149,7 +149,7 @@ xkb_symbols "twoletter" {
 };
 
 partial hidden alphanumeric_keys
-xkb_symbols "level3" {
+xkb_symbols "latlevel3" {
   key <TLDE> {   [ any,any,     notsign,             notsign     ]   }; // ` ~
   key <AE01> {   [ any,any,     dead_tilde,          asciitilde  ]   }; // 1 !
   key <AE02> {   [ any,any,     dead_caron,          caron 	 ]   }; // 2 @
@@ -203,6 +203,46 @@ xkb_symbols "level3" {
 
 };
 
+partial hidden alphanumeric_keys
+xkb_symbols "cyrlevel3" {
+  key <TLDE> {   [ any,any,     degree,              notsign          ]   }; // ` ~
+  key <AE03> {   [ any,any,     dead_circumflex,     NoSymbol         ]   }; // 3 #
+  key <AE07> {   [ any,any,     dead_grave,          NoSymbol         ]   }; // 7 &
+  key <AE08> {   [ any,any,     dead_doublegrave,    NoSymbol         ]   }; // 8 *
+  key <AE09> {   [ any,any,     dead_acute,          NoSymbol         ]   }; // 9 (
+  key <AE10> {   [ any,any,     dead_invertedbreve,  NoSymbol         ]   }; // 0 )
+  key <AE11> {   [ any,any,     dead_macron,         NoSymbol         ]   }; // - _
+
+  key <AD01> {   [ any,any,     backslash,           NoSymbol         ]   }; // q
+  key <AD02> {   [ any,any,     bar,                 NoSymbol         ]   }; // w
+  key <AD03> {   [ any,any,     EuroSign,            sterling         ]   }; // e
+  key <AD04> {   [ any,any,     paragraph,           registered       ]   }; // r
+  key <AD05> {   [ any,any,     ellipsis,            NoSymbol         ]   }; // t // ALPHABETIC
+  key <AD06> {   [ any,any,     leftarrow,           yen              ]   }; // y
+  key <AD07> {   [ any,any,     downarrow,           uparrow          ]   }; // u
+  key <AD08> {   [ any,any,     rightarrow,          NoSymbol         ]   }; // i
+  key <AD09> {   [ any,any,     section,             NoSymbol         ]   }; // o // ALPHABETIC
+  key <AD11> {   [ any,any,     division,            NoSymbol         ]   }; // [
+  key <AD12> {   [ any,any,     multiply,            NoSymbol         ]   }; // ]
+
+  key <AC02> {   [ any,any,     doublelowquotemark,  guillemotright   ]   }; // s
+  key <AC03> {   [ any,any,     leftdoublequotemark, guillemotleft    ]   }; // d
+  key <AC04> {   [ any,any,     bracketleft,         NoSymbol         ]   }; // f
+  key <AC05> {   [ any,any,     bracketright,        NoSymbol         ]   }; // g
+  key <BKSL> {   [ any,any,     currency,            NoSymbol         ]   }; // \
+
+  key <AB01> {   [ any,any,     leftsinglequotemark, NoSymbol         ]   }; // z
+  key <AB02> {   [ any,any,     rightsinglequotemark,NoSymbol         ]   }; // x
+  key <AB03> {   [ any,any,     cent,                copyright        ]   }; // c
+  key <AB04> {   [ any,any,     at,                  NoSymbol         ]   }; // v
+  key <AB05> {   [ any,any,     braceleft,           NoSymbol         ]   }; // b
+  key <AB06> {   [ any,any,     braceright,          NoSymbol         ]   }; // n
+  key <AB07> {   [ any,any,     asciicircum,         NoSymbol         ]   }; // m
+  key <AB08> {   [ any,any,     less,                NoSymbol         ]   }; // , <
+  key <AB09> {   [ any,any,     greater,             NoSymbol         ]   }; // . >
+  key <AB10> {   [ any,any,     emdash,              endash           ]   }; // / ?
+};
+
 partial alphanumeric_keys
 xkb_symbols "latinunicode" {
   // This mapping supports the Unicode characters 0x1c4-0x1cc (dz, lj, and nj
diff --git a/xorg-server/xkbdata.src/symbols/ru b/xorg-server/xkbdata.src/symbols/ru
index 110453bf1..e7317c771 100644
--- a/xorg-server/xkbdata.src/symbols/ru
+++ b/xorg-server/xkbdata.src/symbols/ru
@@ -111,18 +111,21 @@ partial alphanumeric_keys
 xkb_symbols "typewriter" {
     include "ru(common)"
     name[Group1]= "Russia - Typewriter";
-    key	<TLDE> {	[      apostrophe,	  quotedbl	] 	};
-    key	<AE01> {	[	   exclam,		 1 	]	};
-    key	<AE02> {	[      numerosign,		 2	]	};
+    key	<TLDE> {	[	      bar,	      plus	] 	};
+    key	<AE01> {	[      numerosign,		 1 	]	};
+    key	<AE02> {	[           minus,		 2	]	};
     key	<AE03> {	[	    slash,		 3	]	};
-    key	<AE04> {	[	semicolon,		 4	]	};
+    key	<AE04> {	[	 quotedbl,		 4	]	};
     key	<AE05> {	[	    colon,		 5	]	};
     key	<AE06> {	[	    comma,		 6	]	};
     key	<AE07> {	[	   period,		 7	]	};
     key	<AE08> {	[      underscore,		 8	]	};
     key	<AE09> {	[	 question,		 9	]	};
     key	<AE10> {	[	  percent,		 0	]	};
-    key	<BKSL> {	[	parenleft,	parenright	]	};
+    key	<AE11> {	[	   exclam,	     equal	]	};
+    key	<AE12> {	[       semicolon,	 backslash	]	};
+
+    key	<BKSL> {	[	parenright,	 parenleft	]	};
 
     key	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN	]	};
     key	<AB10> {	[     Cyrillic_io,     Cyrillic_IO	]	};
@@ -143,6 +146,7 @@ xkb_symbols "phonetic" {
     key	<AE08> {	[		8,        asterisk	]	};
     key	<AE09> {	[		9,	 parenleft	]	};
     key	<AE10> {	[		0,	parenright	]	};
+    key <AE11> {	[	    minus,	underscore	]	};
 
     key	<AB09> {	[	   period,	   greater	]	};
     key	<AB10> {	[	    slash,	  question	]	};
@@ -186,6 +190,18 @@ xkb_symbols "phonetic" {
 };
 
 partial alphanumeric_keys
+xkb_symbols "phonetic_winkeys" {
+
+    include "ru(phonetic)"
+    name[Group1]= "Russia - Phonetic Winkeys";
+
+    key	<LatX> {	[     Cyrillic_ha,     Cyrillic_HA	]	};
+    key	<LatH> {	[     Cyrillic_che,     Cyrillic_CHE	]	};
+    key	<AE12> {	[ Cyrillic_softsign, Cyrillic_softsign  ]	};
+
+};
+
+partial alphanumeric_keys
 xkb_symbols "tt" {
     include "ru(winkeys)"
     name[Group1]= "Russia - Tatar";
@@ -365,3 +381,60 @@ xkb_symbols "sah" {
 
     include "level3(ralt_switch)"
 };
+
+
+//Kalmyk language layout
+//based on the Kalmyk language layout: http://soft.oyrat.org/
+//Nikolay Korneev <halmg@oyrat.org>
+//Toli Miron <mirontoli@gmail.com>
+        
+partial alphanumeric_keys
+xkb_symbols "xal" {
+    include "ru(winkeys)"
+
+    name[Group1]= "Russia - Kalmyk";
+
+    key.type[group1]="FOUR_LEVEL";
+
+    key <AE01> {        [                     question,                  exclam,               1      ]       };
+    key <AE02> {        [      	            numerosign,                quotedbl,               2      ]       };
+    key <AE03> {        [          Cyrillic_u_straight,     Cyrillic_U_straight,               3      ]       };
+    key <AE04> {        [               Cyrillic_schwa,          Cyrillic_SCHWA,               4      ]       }; 
+    key <AE05> {        [                     asterisk,                 percent,               5      ]       };
+    key <AE06> {        [        Cyrillic_en_descender,   Cyrillic_EN_descender,               6      ]       };
+    key <AE07> {        [               Cyrillic_o_bar,          Cyrillic_O_bar,               7      ]       }; 
+    key <AE08> {        [                Cyrillic_shha,           Cyrillic_SHHA,               8      ]       }; 
+    key <AE09> {        [       Cyrillic_zhe_descender,  Cyrillic_ZHE_descender,               9      ]       };
+    key <AE10> {        [                    semicolon,                   colon,               0      ]       };
+
+    key <TLDE> {        [                    parenleft,               parenright, Cyrillic_io, Cyrillic_IO    ]       };
+
+    key <AD02> {        [                 Cyrillic_tse,             Cyrillic_TSE,         dollar      ]       };
+    key <AD03> {        [                   Cyrillic_u,               Cyrillic_U,       EuroSign      ]       }; 
+    key <AD04> {        [                  Cyrillic_ka,              Cyrillic_KA,     registered      ]       }; 
+    key <AD05> {        [                  Cyrillic_ie,              Cyrillic_IE,      trademark      ]       }; 
+    key <AD11> {        [                  Cyrillic_ha,              Cyrillic_HA,    bracketleft      ]       }; 
+    key <AD12> {        [            Cyrillic_hardsign,        Cyrillic_HARDSIGN,   bracketright      ]       };
+    key <AC11> {        [                   Cyrillic_e,               Cyrillic_E,     apostrophe      ]       };
+    key <AB03> {        [                  Cyrillic_es,              Cyrillic_ES,      copyright      ]       }; 
+    key <AB08> {        [                  Cyrillic_be,              Cyrillic_BE,           less      ]       };
+    key <AB09> {        [                  Cyrillic_yu,              Cyrillic_YU,        greater      ]       };
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "dos" {
+
+    include "ru(common)"
+
+    name[Group1]= "Russia - DOS";
+
+    key        <TLDE> {        [   parenright,  parenleft   ] };
+    key        <AE04> {        [   4,           currency    ] };
+    key        <AE09> {        [   9,           question    ] };
+    key        <AE10> {        [   0,           percent     ] };
+
+    key        <AB10> {        [   Cyrillic_io, Cyrillic_IO ] };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/se b/xorg-server/xkbdata.src/symbols/se
index 427b89996..9b32fd6b3 100644
--- a/xorg-server/xkbdata.src/symbols/se
+++ b/xorg-server/xkbdata.src/symbols/se
@@ -28,6 +28,7 @@ xkb_symbols "se" {
 
     key <SPCE>	{ [     space,      space,        space, nobreakspace ]	};
 
+    key <LSGT> { [ less,	greater,		bar,	bar ] };
     include "kpdl(comma)"
 
     include "level3(ralt_switch)"
diff --git a/xorg-server/xkbdata.src/symbols/sgi_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/sgi_vndr/Makefile.in
index 9993b5a89..0af827346 100644
--- a/xorg-server/xkbdata.src/symbols/sgi_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/sgi_vndr/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -57,8 +53,6 @@ DATA = $(dist_symbols_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -160,6 +131,7 @@ am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build_alias = @build_alias@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 xkb_base = @xkb_base@
 xkb_rules_symlink = @xkb_rules_symlink@
 symbolsdir = $(xkb_base)/symbols/sgi_vndr
@@ -198,8 +174,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -223,10 +199,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
 install-dist_symbolsDATA: $(dist_symbols_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+	test -z "$(symbolsdir)" || $(MKDIR_P) "$(DESTDIR)$(symbolsdir)"
 	@list='$(dist_symbols_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -249,22 +224,21 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -280,7 +254,7 @@ check: check-am
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(symbolsdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -326,12 +300,20 @@ info-am:
 
 install-data-am: install-dist_symbolsDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -350,17 +332,21 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dist_symbolsDATA uninstall-info-am
+uninstall-am: uninstall-dist_symbolsDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-dist_symbolsDATA install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-dist_symbolsDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_symbolsDATA uninstall-info-am
+	uninstall-dist_symbolsDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/xkbdata.src/symbols/si b/xorg-server/xkbdata.src/symbols/si
index 8e49cac51..ced6d2fe7 100644
--- a/xorg-server/xkbdata.src/symbols/si
+++ b/xorg-server/xkbdata.src/symbols/si
@@ -7,6 +7,8 @@ xkb_symbols "basic" {
     name[Group1]="Slovenia";
 
     include "rs(latin)"
+
+    key <TLDE> { type[Group1]="TWO_LEVEL", [ cedilla, diaeresis ] };
 };
 
 partial alphanumeric_keys 
@@ -15,6 +17,8 @@ xkb_symbols "us" {
     name[Group1]= "Slovenia - US keyboard with Slovenian letters";
 
     include "rs(latinyz)"
+
+    key <TLDE> { type[Group1]="TWO_LEVEL", [ cedilla, diaeresis ] };
 };
 
 
@@ -24,20 +28,6 @@ xkb_symbols "alternatequotes" {
     name[Group1]= "Slovenia - Use guillemets for quotes";
 
     include "rs(latinalternatequotes)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "unicode" {
-
-    name[Group1]= "Slovenia - Use Slovenian digraphs";
-
-    include "rs(latinunicode)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "unicodeus" {
-
-    name[Group1]= "Slovenia - US keyboard with Slovenian digraphs";
 
-    include "rs(latinunicodeyz)"
+    key <TLDE> { type[Group1]="TWO_LEVEL", [ cedilla, diaeresis ] };
 };
diff --git a/xorg-server/xkbdata.src/symbols/sn b/xorg-server/xkbdata.src/symbols/sn
new file mode 100644
index 000000000..90ffe6111
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/sn
@@ -0,0 +1,42 @@
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "latin"
+
+    name[Group1]="Senegal";
+
+    key <AE01>	{ [ ampersand,          1,          bar,     NoSymbol ]	};
+    key <AE02>	{ [    eacute,          2,   asciitilde,       Eacute ]	};
+    key <AE03>	{ [  quotedbl,          3,   numbersign,      cedilla ]	};
+    key <AE04>	{ [apostrophe,          4,    braceleft,        acute ]	};
+    key <AE05>	{ [ parenleft,          5,  bracketleft,    diaeresis ]	};
+    key <AE06>	{ [     minus,          6,          bar,    brokenbar ]	};
+    key <AE07>	{ [    egrave,          7,   dead_grave,       Egrave ]	};
+    key <AE08>	{ [underscore,          8,    backslash,       macron ]	};
+    key <AE09>	{ [  ccedilla,          9,  asciicircum,     Ccedilla ]	};
+    key <AE10>	{ [    agrave,          0,           at,       Agrave ]	};
+    key <AE11>	{ [parenright,     degree, bracketright,   ydiaeresis ]	};
+    key <AE12>	{ [     equal,       plus,   braceright,threequarters ]	};
+
+    key <AD01>	{ [         a,          A,           ae,           AE ]	};
+    key <AD02>	{ [         z,          Z, guillemotleft,        less ]	};
+    key <AD03>	{ [         e,          E,     EuroSign,         cent ]	};
+    key <AD11>	{ [       eng,        ENG,  bracketleft, bracketright ] };
+    key <AD12>	{ [    dollar,   sterling,     currency,  ecircumflex ]	};
+
+    key <AC01>	{ [         q,          Q,           at,  Greek_OMEGA ]	};
+    key <AC10>	{ [         m,          M,           mu,    masculine ]	};
+    key <AC11>	{ [    ntilde,     Ntilde,        acute,   dead_acute ]	};
+    key <TLDE>	{ [twosuperior,   percent,      notsign,      notsign ]	};
+
+    key <BKSL>	{ [        mu,   sterling,        grave,   dead_grave ]	};
+    key <AB01>	{ [         w,          W,      lstroke,      Lstroke ]	};
+    key <AB07>	{ [     comma,   question, questiondown,     NoSymbol ] };
+    key <AB08>	{ [ semicolon,     period, horizconnector,   multiply ]	};
+    key <AB09>	{ [     colon,      slash, periodcentered,   division ]	};
+    key <AB10>	{ [    exclam,    section,   exclamdown,     NoSymbol ] };
+
+    key <LSGT>	{ [      less,    greater,          bar,     NoSymbol ] };
+
+    include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkbdata.src/symbols/sony_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/sony_vndr/Makefile.in
index ffac4c57c..52cd9085f 100644
--- a/xorg-server/xkbdata.src/symbols/sony_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/sony_vndr/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -57,8 +53,6 @@ DATA = $(dist_symbols_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -160,6 +131,7 @@ am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build_alias = @build_alias@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 xkb_base = @xkb_base@
 xkb_rules_symlink = @xkb_rules_symlink@
 symbolsdir = $(xkb_base)/symbols/sony_vndr
@@ -198,8 +174,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -223,10 +199,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
 install-dist_symbolsDATA: $(dist_symbols_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+	test -z "$(symbolsdir)" || $(MKDIR_P) "$(DESTDIR)$(symbolsdir)"
 	@list='$(dist_symbols_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -249,22 +224,21 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -280,7 +254,7 @@ check: check-am
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(symbolsdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -326,12 +300,20 @@ info-am:
 
 install-data-am: install-dist_symbolsDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -350,17 +332,21 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dist_symbolsDATA uninstall-info-am
+uninstall-am: uninstall-dist_symbolsDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-dist_symbolsDATA install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-dist_symbolsDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_symbolsDATA uninstall-info-am
+	uninstall-dist_symbolsDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/xkbdata.src/symbols/srvr_ctrl b/xorg-server/xkbdata.src/symbols/srvr_ctrl
index 712f763e6..cf7012b4d 100644
--- a/xorg-server/xkbdata.src/symbols/srvr_ctrl
+++ b/xorg-server/xkbdata.src/symbols/srvr_ctrl
@@ -13,11 +13,6 @@ xkb_symbols "xfree86" {
 partial keypad_keys 
 xkb_symbols "stdkeypad" {
 
-    key <BKSP> {
-	type="CTRL+ALT",
-	symbols[Group1]= [ BackSpace,   Terminate_Server ]
-    };
-
 // Ungrab cancels server/keyboard/pointer grabs
     key <KPDV> {
 	type="CTRL+ALT",
@@ -127,8 +122,6 @@ xkb_symbols "no_srvr_keys" {
     key <FK11> { [ F11, F11 ]	};
     key <FK12> { [ F12, F12 ]	};
 
-    key <BKSP> { [ BackSpace,	BackSpace	] };
-
     key <KPDV> { [ KP_Divide,	KP_Divide	] };
     key <KPMU> { [ KP_Multiply,	KP_Multiply	] };
     key <KPSU> { [ KP_Subtract,	KP_Subtract	] };
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.in
index 3fc8cbccc..8db5fff20 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -57,8 +53,6 @@ DATA = $(dist_symbols_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -160,6 +131,7 @@ am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build_alias = @build_alias@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 xkb_base = @xkb_base@
 xkb_rules_symlink = @xkb_rules_symlink@
 symbolsdir = $(xkb_base)/symbols/sun_vndr
@@ -203,8 +179,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -228,10 +204,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
 install-dist_symbolsDATA: $(dist_symbols_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+	test -z "$(symbolsdir)" || $(MKDIR_P) "$(DESTDIR)$(symbolsdir)"
 	@list='$(dist_symbols_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -254,22 +229,21 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -285,7 +259,7 @@ check: check-am
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(symbolsdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -331,12 +305,20 @@ info-am:
 
 install-data-am: install-dist_symbolsDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -355,17 +337,21 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dist_symbolsDATA uninstall-info-am
+uninstall-am: uninstall-dist_symbolsDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-dist_symbolsDATA install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-dist_symbolsDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_symbolsDATA uninstall-info-am
+	uninstall-dist_symbolsDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xorg-server/xkbdata.src/symbols/symbols.dir b/xorg-server/xkbdata.src/symbols/symbols.dir
index 917a260a8..e68960ad3 100644
--- a/xorg-server/xkbdata.src/symbols/symbols.dir
+++ b/xorg-server/xkbdata.src/symbols/symbols.dir
@@ -1,114 +1,203 @@
--dp----- a------- mn(basic)
---p----- a------- mn(olpc)
---p----- -m------ compose(ralt)
---p----- -m------ compose(lwin)
---p----- -m------ compose(rwin)
---p----- -m------ compose(menu)
---p----- -m------ compose(rctrl)
---p----- -m------ compose(caps)
---p----- -m------ compose(102)
--d------ -------- de(basic)
---p----- a------- de(nodeadkeys)
---p----- a------- de(deadgraveacute)
---p----- a------- de(deadacute)
---p----- a------- de(ro)
---p----- a------- de(ro_nodeadkeys)
---p----- a------- de(dvorak)
---p----- a------- de(Sundeadkeys)
---p----- a------- de(sundeadkeys)
---p----- a------- de(neo)
---p----- a------- de(mac)
---p----- a------- de(mac_nodeadkeys)
---p----- -------- nbsp1(none)
---p----- -------- nbsp1(level2)
---p----- -------- nbsp1(level3)
---p----- -------- nbsp1(level3s)
---p----- -------- nbsp1(level3n)
---p----- -------- nbsp1(level4)
---p----- -------- nbsp1(level4n)
---p----- -------- nbsp1(level4nl)
--dp----- a------- il(basic)
---p----- a------- il(lyx)
---p----- a------- il(phonetic)
---p----- a------- il(biblical)
--dp----- a------- ro(basic)
---p----- a------- ro(cedilla)
---p----- a------- ro(std)
---p----- a------- ro(std_cedilla)
---p----- a------- ro(winkeys)
---p----- -------- eurosign(e)
---p----- -------- eurosign(2)
---p----- -------- eurosign(4)
---p----- -------- eurosign(5)
--dp----- a------- me(basic)
---p----- a------- me(cyrillic)
---p----- a------- me(cyrillicyz)
---p----- a------- me(latinunicode)
---p----- a------- me(latinyz)
---p----- a------- me(latinunicodeyz)
--------- -------- me(cyrillicalternatequotes)
--------- -------- me(latinalternatequotes)
--dp----- a------- mm(basic)
--dp----- a------- ma(arabic)
---p----- a------- ma(french)
---p----- a------- ma(tifinagh)
---p----- a------- ma(tifinagh-phonetic)
---p----- a------- ma(tifinagh-extended)
---p----- a------- ma(tifinagh-extended-phonetic)
---p----- a------- ma(tifinagh-alt)
---p----- a------- ma(tifinagh-alt-phonetic)
--dp----- a------- fi(kotoistus)
---p----- a------- fi(classic)
-h-p----- a------- fi(fi)
---p----- a------- fi(nodeadkeys)
--------- -------- fi(smi)
---p----- a------- fi(mac)
--dp----- a------- bt(basic)
--dp----- a------- ie(basic)
---p----- a------- ie(CloGaelach)
---p----- a------- ie(UnicodeExpert)
---p----- a------- ie(ogam)
---p----- a------- ie(ogam_is434)
--dp----- a------- be(basic)
---p----- a------- be(iso-alternate)
---p----- a------- be(sundeadkeys)
---p----- a------- be(Sundeadkeys)
---p----- a------- be(nodeadkeys)
---p----- a------- be(wang)
---p----- --kf---- srvr_ctrl(xfree86)
---p----- --k----- srvr_ctrl(stdkeypad)
---p----- ---f---- srvr_ctrl(fkey2vt)
---p----- --kf---- srvr_ctrl(no_srvr_keys)
--dp----- a------- ba(basic)
---p----- a------- ba(us)
---p----- a------- ba(alternatequotes)
---p----- a------- ba(unicode)
---p----- a------- ba(unicodeus)
+-dp----- a------- am(basic)
+--p----- a------- am(olpc)
+-------- -------- am(phonetic)
+--p----- a------- am(phonetic-alt)
+--p----- a------- am(eastern)
+--p----- a------- am(western)
+--p----- a------- am(eastern-alt)
+-dp----- -m------ terminate(ctrl_alt_bksp)
+-dp----- a------- fr(basic)
+--p----- a------- fr(Sundeadkeys)
+--p----- a------- fr(sundeadkeys)
+--p----- a------- fr(nodeadkeys)
+--p----- a------- fr(oss)
+--p----- a------- fr(oss_latin9)
+--p----- a------- fr(oss_Sundeadkeys)
+--p----- a------- fr(oss_sundeadkeys)
+--p----- a------- fr(oss_nodeadkeys)
+--p----- a------- fr(latin9)
+--p----- a------- fr(latin9_Sundeadkeys)
+--p----- a------- fr(latin9_sundeadkeys)
+--p----- a------- fr(latin9_nodeadkeys)
+--p----- a------- fr(bepo)
+--p----- a------- fr(bepo_latin9)
+--p----- am------ fr(dvorak)
+--p----- a------- fr(bre)
+--p----- a------- fr(oci)
+--p----- a------- fr(mac)
+--p----- a------- fr(geo)
 -dp----- a------- ng(basic)
 --p----- a------- ng(yoruba)
 --p----- a------- ng(igbo)
 --p----- a------- ng(hausa)
 --p----- a------- ng(olpc)
+-dp----- a------- np(basic)
+--p----- a------- np(olpc)
+-dp----- a------- nl(basic)
+--p----- a------- nl(std)
+--p----- a------- nl(Sundeadkeys)
+--p----- a------- nl(sundeadkeys)
+--p----- a------- nl(mac)
+-dp----- a------- ad(basic)
+-dp----- a------- ua(unicode)
+--p----- a------- ua(legacy)
+--p----- a------- ua(winkeys)
+--p----- a------- ua(typewriter)
+--p----- a------- ua(phonetic)
+--p----- a------- ua(rstu)
+--p----- a------- ua(rstu_ru)
+--p----- a------- ua(homophonic)
+--p----- -------- ua(crh)
+--p----- -------- ua(crh_f)
+--p----- -------- ua(crh_alt)
+-dp----- a------- rs(basic)
+--p----- a------- rs(latin)
+--p----- a------- rs(yz)
+h-p----- a------- rs(common)
+h-p----- a------- rs(cyralpha)
+h-p----- a------- rs(latalpha)
+h-p----- a------- rs(twoletter)
+h-p----- a------- rs(latlevel3)
+h-p----- a------- rs(cyrlevel3)
+--p----- a------- rs(latinunicode)
+--p----- a------- rs(latinyz)
+--p----- a------- rs(latinunicodeyz)
+-------- -------- rs(alternatequotes)
+-------- -------- rs(latinalternatequotes)
+-dp----- a------- cd(basic)
+-dp----- a------- epo(basic)
+--p----- a------- epo(legacy)
+--p----- -------- epo(qwerty)
+--p----- -------- epo(dvorak)
+-dp----- a------- tj(basic)
+-------- -------- tj(legacy)
 -dp----- a------- af(basic)
 --p----- a------- af(ps)
 --p----- a------- af(uz)
 --p----- a------- af(olpc-ps)
 --p----- a------- af(olpc-fa)
 --p----- a------- af(olpc-uz)
--dp----- a------- dk(basic)
---p----- a------- dk(nodeadkeys)
---p----- a------- dk(mac)
---p----- a------- dk(mac_nodeadkeys)
---p----- a------- dk(dvorak)
+-dp----- a------- ch(basic)
+--p----- a------- ch(de)
+--p----- a------- ch(de_Sundeadkeys)
+--p----- a------- ch(de_sundeadkeys)
+--p----- a------- ch(de_nodeadkeys)
+--p----- a------- ch(fr)
+--p----- a------- ch(fr_Sundeadkeys)
+--p----- a------- ch(fr_sundeadkeys)
+--p----- a------- ch(fr_nodeadkeys)
+--p----- a------- ch(de_mac)
+--p----- a------- ch(fr_mac)
+-dp----- am------ pc(pc105)
+h-p----- a------- pc(function)
+h-p----- a------- pc(editing)
+-dp----- a------- pl(basic)
+--p----- a------- pl(qwertz)
+--p----- a------- pl(dvorak)
+--p----- a------- pl(dvorak_quotes)
+--p----- a------- pl(dvorak_altquotes)
+--p----- a------- pl(csb)
+--p----- a------- pl(ru_phonetic_dvorak)
+-dp----- a------- th(basic)
+--p----- a------- th(pat)
+--p----- a------- th(tis)
+--p----- a------- th(olpc)
+-dp----- a------- no(basic)
+--p----- a------- no(nodeadkeys)
+--p----- a------- no(dvorak)
+--p----- a------- no(smi)
+--p----- a------- no(smi_nodeadkeys)
+--p----- a------- no(mac)
+--p----- a------- no(mac_nodeadkeys)
+-dp----- a------- iq(basic)
+--p----- a------- iq(ku)
+--p----- a------- iq(ku_f)
+--p----- a------- iq(ku_alt)
+--p----- a------- iq(ku_ara)
+-dp----- am------ lt(basic)
+--p----- am------ lt(us)
+--p----- am------ lt(std)
+--p----- am------ lt(ibm)
+--p----- am------ lt(lekp)
+--p----- am------ lt(lekpa)
+--p----- am------ lt(balticplus)
+--p----- --k----- kpdl(dot)
+--p----- --k----- kpdl(comma)
+--p----- --k----- kpdl(dotoss)
+--p----- --k----- kpdl(dotoss_latin9)
+--p----- --k----- kpdl(commaoss)
+--p----- --k----- kpdl(momayyezoss)
+--p----- --k----- kpdl(kposs)
+--p----- --k----- kpdl(semi)
+-dp----- a------- il(basic)
+--p----- a------- il(lyx)
+--p----- a------- il(phonetic)
+--p----- a------- il(biblical)
+-dp----- a------- sn(basic)
+-dp----- a------- in(deva)
+--p----- a------- in(bolnagri)
+--p----- a------- in(ben)
+-------- -------- in(ben_probhat)
+--p----- a------- in(guj)
+--p----- a------- in(kan)
+--p----- a------- in(mal)
+--p----- a------- in(mal_lalitha)
+--p----- a------- in(ori)
+--p----- a------- in(tam)
+--p----- a------- in(tam_unicode)
+--p----- a------- in(tam_TSCII)
+--p----- a------- in(tam_TAB)
+--p----- a------- in(tel)
+--p----- a------- in(urd-phonetic)
+--p----- a------- in(urd-phonetic3)
+--p----- a------- in(urd-winkeys)
+--p----- a------- in(guru)
+--p----- a------- in(jhelum)
+--p----- a------- in(olpc)
+--p----- a------- in(hin-wx)
 -dp----- a------- fo(basic)
 --p----- a------- fo(nodeadkeys)
--dp----- a---g--- gr(basic)
---p----- a---g--- gr(simple)
-h-p----- a---g--- gr(bare)
---p----- a---g--- gr(extended)
---p----- a---g--- gr(polytonic)
---p----- a---g--- gr(nodeadkeys)
--------- -------- sony_vndr/us(nwp5461)
+-dp----- a------- hr(basic)
+--p----- a------- hr(us)
+--p----- a------- hr(alternatequotes)
+--p----- a------- hr(unicode)
+--p----- a------- hr(unicodeus)
+-dp----- a------- by(basic)
+--p----- a------- by(winkeys)
+--p----- a------- by(latin)
+-dp----- -------- tr(basic)
+--p----- -------- tr(f)
+--p----- -------- tr(alt)
+--p----- a------- tr(Sundeadkeys)
+--p----- a------- tr(sundeadkeys)
+--p----- -------- tr(ku)
+--p----- -------- tr(ku_f)
+--p----- -------- tr(ku_alt)
+--p----- -------- tr(intl)
+--p----- a------- tr(olpc)
+--p----- -------- tr(crh)
+--p----- -------- tr(crh_f)
+--p----- -------- tr(crh_alt)
+-dp----- a------- gn(basic)
+-dp----- a------- es(basic)
+--p----- a------- es(Sundeadkeys)
+--p----- a------- es(sundeadkeys)
+--p----- a------- es(nodeadkeys)
+--p----- a------- es(dvorak)
+--p----- a------- es(cat)
+--p----- a------- es(ast)
+--p----- a------- es(mac)
+--p----- a------- es(olpc)
+--p----- a------- es(deadtilde)
+-dp----- a------- cz(basic)
+-------- -------- cz(bksl)
+--p----- a------- cz(qwerty)
+-------- -------- cz(qwerty_bksl)
+--p----- a---g--- cz(ucw)
+-dp----- a------- bd(basic)
+-------- -------- bd(probhat)
+-dp----- a------- kh(basic)
+--p----- a------- kh(olpc)
 -dp----- -------- hu(basic)
 --p----- -------- hu(standard)
 --p----- -------- hu(nodeadkeys)
@@ -137,23 +226,51 @@ h-p----- --k----- hu(def_dot)
 h-p----- a------- hu(def_dead)
 h-p----- a------- hu(def_nodead)
 h-p----- a------- hu(def_common)
--------- -------- sun_vndr/de(type4)
--------- -------- sun_vndr/fi(basic)
--------- -------- sun_vndr/ko(type4)
--------- -------- sun_vndr/ko(type5)
---p----- -------- sun_vndr/ko(type6)
--------- -------- sun_vndr/tw(type4)
--------- -------- sun_vndr/tw(type5)
---p----- -------- sun_vndr/tw(type6)
--------- -------- sun_vndr/dk(type4)
--------- -------- sun_vndr/dk(type5)
--------- -------- sun_vndr/gr(type5)
--dp----- a------- sun_vndr/hu(type5)
--------- -------- sun_vndr/cz(type5)
--dp----- -------- sun_vndr/solaris(defaults)
---p----- -------- sun_vndr/solaris(keynames)
---p----- -------- sun_vndr/solaris(xf86keynames)
+-dp----- a------- ir(basic)
+h-p----- a------- ir(part_pro)
+h-p----- a------- ir(part_keypad)
+--p----- a------- ir(pro)
+--p----- a------- ir(keypad)
+--p----- a------- ir(pro_keypad)
+--p----- a------- ir(ku)
+--p----- a------- ir(ku_f)
+--p----- a------- ir(ku_alt)
+--p----- a------- ir(ku_ara)
+-dp----- a------- mt(basic)
+--p----- a------- mt(us)
+-------- -------- sgi_vndr/jp(jp106)
+-------- -------- sgi_vndr/jp(alternate106)
+-dp----- a------- pk(urd-phonetic)
+--p----- a------- pk(urd-crulp)
+--p----- a------- pk(urd-nla)
+--p----- a------- pk(ara)
+--p----- a------- pk(olpc)
+-------- -------- sun_vndr/fr(type4)
+-------- -------- sun_vndr/fr(type5)
+-------- -------- sun_vndr/fr(type6)
+-------- -------- sun_vndr/nl(type4)
+-------- -------- sun_vndr/tuv(type4basic)
+-------- -------- sun_vndr/tuv(type4)
+-------- -------- sun_vndr/tuv(type5basic)
+-------- -------- sun_vndr/tuv(type5)
+-------- -------- sun_vndr/pl(type5)
+-------- -------- sun_vndr/no(type4)
+-------- -------- sun_vndr/no(type5)
+-------- -------- sun_vndr/usb(sun_usb)
 -dp----- a------- sun_vndr/lt(type5)
+-------- -------- sun_vndr/tr(basic)
+-------- -------- sun_vndr/tr(type6Q)
+-------- -------- sun_vndr/tr(type6F)
+--p----- -------- sun_vndr/es(type4)
+--p----- -------- sun_vndr/es(type5)
+--p----- -------- sun_vndr/es(type6)
+-------- -------- sun_vndr/cz(type5)
+-dp----- a------- sun_vndr/hu(type5)
+-------- -------- sun_vndr/sw(type4de)
+-------- -------- sun_vndr/sw(type4fr)
+-------- -------- sun_vndr/sw(type5fr)
+-------- -------- sun_vndr/sw(type5de)
+-------- -------- sun_vndr/gr(type5)
 -------- -------- sun_vndr/jp(basic)
 -------- -------- sun_vndr/jp(type4)
 -------- -------- sun_vndr/jp(type5)
@@ -163,30 +280,18 @@ h-p----- a------- hu(def_common)
 -------- -------- sun_vndr/jp(J3100)
 -------- -------- sun_vndr/jp(Muhenkan_x86)
 --p----- -------- sun_vndr/jp(type7)
--------- -------- sun_vndr/no(type4)
--------- -------- sun_vndr/no(type5)
--dp----- a------- sun_vndr/lv(type5)
--------- -------- sun_vndr/pl(type5)
 -------- -------- sun_vndr/gb(type4)
 --p----- -------- sun_vndr/gb(type5)
 --p----- -------- sun_vndr/gb(type6)
--------- -------- sun_vndr/tr(basic)
--------- -------- sun_vndr/tr(type6Q)
--------- -------- sun_vndr/tr(type6F)
--------- -------- sun_vndr/pt(type4)
--------- -------- sun_vndr/pt(type5)
---p----- -------- sun_vndr/pt(type6)
--------- -------- sun_vndr/sw(type4de)
--------- -------- sun_vndr/sw(type4fr)
--------- -------- sun_vndr/sw(type5fr)
--------- -------- sun_vndr/sw(type5de)
--------- -------- sun_vndr/fr(type4)
--------- -------- sun_vndr/fr(type5)
--------- -------- sun_vndr/fr(type6)
--------- -------- sun_vndr/nl(type4)
 -------- -------- sun_vndr/se(type4)
 -------- -------- sun_vndr/se(type5)
 --p----- -------- sun_vndr/se(type6)
+-------- -------- sun_vndr/dk(type4)
+-------- -------- sun_vndr/dk(type5)
+-------- -------- sun_vndr/pt(type4)
+-------- -------- sun_vndr/pt(type5)
+--p----- -------- sun_vndr/pt(type6)
+-------- -------- sun_vndr/cs(type5)
 h------- -------- sun_vndr/us(sunbasic)
 h------- -------- sun_vndr/us(left_funkeys)
 h------- -------- sun_vndr/us(volumekeys)
@@ -202,31 +307,49 @@ h------- -------- sun_vndr/us(volumekeys)
 -------- -------- sun_vndr/us(pc104)
 -------- -------- sun_vndr/us(pc101currency)
 -------- -------- sun_vndr/us(US101A_Sun)
---p----- -------- sun_vndr/es(type4)
---p----- -------- sun_vndr/es(type5)
---p----- -------- sun_vndr/es(type6)
+-------- -------- sun_vndr/de(type4)
+-dp----- -------- sun_vndr/solaris(defaults)
+--p----- -------- sun_vndr/solaris(keynames)
+--p----- -------- sun_vndr/solaris(xf86keynames)
 -------- -------- sun_vndr/it(type4)
 -------- -------- sun_vndr/it(type5)
 --p----- -------- sun_vndr/it(type6)
--------- -------- sun_vndr/tuv(type4basic)
--------- -------- sun_vndr/tuv(type4)
--------- -------- sun_vndr/tuv(type5basic)
--------- -------- sun_vndr/tuv(type5)
--------- -------- sun_vndr/cs(type5)
--------- -------- sun_vndr/usb(sun_usb)
+-------- -------- sun_vndr/tw(type4)
+-------- -------- sun_vndr/tw(type5)
+--p----- -------- sun_vndr/tw(type6)
 -------- -------- sun_vndr/ru(basic)
 --p----- -------- sun_vndr/ru(type6)
--dp----- a------- az(latin)
---p----- a------- az(cyrillic)
--dp----- a------- ge(basic)
---p----- a------- ge(qwerty)
---p----- a------- ge(ergonomic)
---p----- a------- ge(mess)
---p----- a------- ge(ru)
---p----- a------- ge(os)
--------- -------- hp_vndr/us(hil)
--dp----- a------- et(basic)
---p----- a------- et(olpc)
+-dp----- a------- sun_vndr/lv(type5)
+-------- -------- sun_vndr/ko(type4)
+-------- -------- sun_vndr/ko(type5)
+--p----- -------- sun_vndr/ko(type6)
+-------- -------- sun_vndr/fi(basic)
+-dp----- a------- ro(basic)
+--p----- a------- ro(cedilla)
+--p----- a------- ro(std)
+--p----- a------- ro(std_cedilla)
+--p----- a------- ro(winkeys)
+--p----- -------- ro(crh_f)
+--p----- -------- ro(crh_alt)
+--p----- -------- ro(crh_dobruca1)
+--p----- -------- ro(crh_dobruca2)
+-dp----- a------- mm(basic)
+-dp----- a------- ee(basic)
+--p----- a------- ee(nodeadkeys)
+--p----- a------- ee(dvorak)
+--p----- a------- ee(us)
+hdp----- -m------ capslock(capslock)
+h-p----- -m------ capslock(shiftlock)
+h-p----- -m------ capslock(grouplock)
+h-p----- -m------ capslock(swapescape)
+h-p----- -m------ capslock(groupshift)
+h-p----- -m------ capslock(escape)
+h-p----- -m------ capslock(backspace)
+-dp----- a------- is(basic)
+--p----- a------- is(Sundeadkeys)
+--p----- a------- is(nodeadkeys)
+--p----- a------- is(mac)
+--p----- a------- is(dvorak)
 -d------ -------- br(abnt2)
 --p----- a------- br(nodeadkeys)
 --p----- a------- br(thinkpad)
@@ -235,78 +358,69 @@ h------- -------- sun_vndr/us(volumekeys)
 --p----- a------- br(nativo)
 --p----- a------- br(nativo-us)
 --p----- a------- br(nativo-epo)
--dp----- a------- kz(basic)
---p----- a------- kz(ruskaz)
---p----- a------- kz(kazrus)
---p----- a------- kz(olpc)
---p----- --k----- kpdl(dot)
---p----- --k----- kpdl(comma)
---p----- --k----- kpdl(dotoss)
---p----- --k----- kpdl(dotoss_latin9)
---p----- --k----- kpdl(commaoss)
---p----- --k----- kpdl(momayyezoss)
---p----- --k----- kpdl(kposs)
--dp----- a------- kh(basic)
---p----- a------- kh(olpc)
--dp----- a------- cn(basic)
---p----- a------- cn(tib)
---p----- a------- cn(tib_asciinum)
---p----- -m------ altwin(meta_alt)
---p----- -m------ altwin(ctrl_win)
---p----- -m------ altwin(meta_win)
---p----- -m------ altwin(left_meta_win)
---p----- -m------ altwin(super_win)
---p----- -m------ altwin(hyper_win)
---p----- -m------ altwin(menu)
---p----- -m------ altwin(alt_super_win)
---p----- -m------ altwin(swap_lalt_lwin)
---p----- -m------ ctrl(nocaps)
---p----- -m------ ctrl(swapcaps)
---p----- -m------ ctrl(ctrl_ac)
---p----- -m------ ctrl(ctrl_aa)
---p----- -m------ ctrl(ctrl_ra)
--dp----- a------- lk(sin_phonetic)
---p----- a------- lk(tam_unicode)
---p----- a------- lk(tam_TAB)
--dp----- a------- cz(basic)
--------- -------- cz(bksl)
---p----- a------- cz(qwerty)
--------- -------- cz(qwerty_bksl)
---p----- a---g--- cz(ucw)
--dp----- a------- bg(bds)
---p----- a------- bg(phonetic)
--dp----- a------- sk(basic)
--------- -------- sk(bksl)
---p----- a------- sk(qwerty)
--------- -------- sk(qwerty_bksl)
--dp----- am------ lt(basic)
---p----- am------ lt(us)
---p----- am------ lt(std)
---p----- am------ lt(ibm)
---p----- am------ lt(lekp)
---p----- am------ lt(lekpa)
---p----- am------ lt(balticplus)
--------- -------- fujitsu_vndr/jp
--------- -------- fujitsu_vndr/us
--dp----- a------- gn(basic)
--dp----- a------- rs(basic)
---p----- a------- rs(latin)
---p----- a------- rs(yz)
-h-p----- a------- rs(common)
-h-p----- a------- rs(cyralpha)
-h-p----- a------- rs(latalpha)
-h-p----- a------- rs(twoletter)
-h-p----- a------- rs(level3)
---p----- a------- rs(latinunicode)
---p----- a------- rs(latinyz)
---p----- a------- rs(latinunicodeyz)
--------- -------- rs(alternatequotes)
--------- -------- rs(latinalternatequotes)
+-dp----- -------- latin(basic)
+--p----- -------- latin(type2)
+--p----- -------- latin(type3)
+--p----- -------- latin(type4)
+--p----- -------- latin(nodeadkeys)
+--p----- -------- latin(type2_nodeadkeys)
+--p----- -------- latin(type3_nodeadkeys)
+--p----- -------- latin(type4_nodeadkeys)
+-dp----- a------- mao(basic)
+-dp----- a---g--- gr(basic)
+--p----- a---g--- gr(simple)
+h-p----- a---g--- gr(bare)
+--p----- a---g--- gr(extended)
+--p----- a---g--- gr(polytonic)
+--p----- a---g--- gr(nodeadkeys)
 -dp----- a------- jp(106)
 h-p----- a------- jp(common)
 --p----- a------- jp(OADG109A)
 --p----- a------- jp(kana)
 --p----- a------- jp(nicola_f_bs)
+-d------ a------- kr(kr106)
+-------- a------- kr(kr104)
+h-p----- ---f---- kr(koreankeys)
+h-p----- ---f---- kr(koreankeys_raltctl)
+-dp----- a------- ara(basic)
+--p----- a------- ara(qwerty)
+--p----- a------- ara(azerty)
+--p----- a------- ara(digits)
+--p----- a------- ara(qwerty_digits)
+--p----- a------- ara(azerty_digits)
+--p----- a------- ara(buckwalter)
+--p----- a------- ara(olpc)
+-d------ -------- xfree68_vndr/ataritt(us)
+-------- -------- xfree68_vndr/ataritt(de)
+-d------ -------- xfree68_vndr/amiga(usa1)
+-dp----- a------- gb(basic)
+--p----- a------- gb(intl)
+--p----- a------- gb(extd)
+--p----- a------- gb(colemak)
+--p----- a------- gb(dvorak)
+--p----- a------- gb(dvorakukp)
+--p----- a------- gb(mac)
+--p----- -------- eurosign(e)
+--p----- -------- eurosign(2)
+--p----- -------- eurosign(4)
+--p----- -------- eurosign(5)
+-dp----- -------- typo(base)
+-dp----- -m------ level3(ralt_switch)
+--p----- -m------ level3(ralt_alt)
+--p----- -m------ level3(ralt_switch_multikey)
+h-p----- -m------ level3(ralt_switch_for_alts_toggle)
+--p----- -m------ level3(alt_switch)
+--p----- -m------ level3(lalt_switch)
+--p----- -m------ level3(switch)
+--p----- -m------ level3(menu_switch)
+--p----- -m------ level3(win_switch)
+--p----- -m------ level3(lwin_switch)
+--p----- -m------ level3(rwin_switch)
+--p----- -m------ level3(enter_switch)
+--p----- --kf---- srvr_ctrl(xfree86)
+--p----- --k----- srvr_ctrl(stdkeypad)
+--p----- ---f---- srvr_ctrl(fkey2vt)
+--p----- --kf---- srvr_ctrl(no_srvr_keys)
 h-p----- --k----- keypad(overlay)
 h-p----- --k----- keypad(overlay1)
 h-p----- --k----- keypad(overlay2)
@@ -327,162 +441,76 @@ hdp----- --k----- keypad(x11)
 --p----- --k----- keypad(legacynumber_wang)
 --p----- --k----- keypad(ossnumber)
 --p----- --k----- keypad(ossnumber_wang)
---p----- --k----- keypad(phone_hex)
--dp----- a------- hr(basic)
---p----- a------- hr(us)
---p----- a------- hr(alternatequotes)
---p----- a------- hr(unicode)
---p----- a------- hr(unicodeus)
--dp----- a------- latam(basic)
---p----- a------- latam(Sundeadkeys)
---p----- a------- latam(sundeadkeys)
---p----- a------- latam(nodeadkeys)
--dp----- a------- sy(basic)
---p----- a------- sy(syc)
---p----- a------- sy(syc_phonetic)
---p----- a------- sy(ku)
---p----- a------- sy(ku_f)
---p----- a------- sy(ku_alt)
--dp----- a------- am(basic)
---p----- a------- am(olpc)
--------- -------- am(phonetic)
---p----- a------- am(phonetic-alt)
---p----- a------- am(eastern)
---p----- a------- am(western)
---p----- a------- am(eastern-alt)
---p----- -m------ level5(rctrl_switch)
--d------ a------- kr(kr106)
--------- a------- kr(kr104)
-h-p----- ---f---- kr(koreankeys)
-h-p----- ---f---- kr(koreankeys_raltctl)
--d------ -------- xfree68_vndr/amiga(usa1)
--d------ -------- xfree68_vndr/ataritt(us)
--------- -------- xfree68_vndr/ataritt(de)
--dp----- a------- no(basic)
---p----- a------- no(nodeadkeys)
---p----- a------- no(dvorak)
---p----- a------- no(smi)
---p----- a------- no(smi_nodeadkeys)
---p----- a------- no(mac)
---p----- a------- no(mac_nodeadkeys)
--dp----- a------- mv(basic)
--dp----- -------- latin(basic)
---p----- -------- latin(type2)
---p----- -------- latin(type3)
---p----- -------- latin(type4)
---p----- -------- latin(nodeadkeys)
---p----- -------- latin(type2_nodeadkeys)
---p----- -------- latin(type3_nodeadkeys)
---p----- -------- latin(type4_nodeadkeys)
--dp----- a------- ua(basic)
---p----- a------- ua(winkeys)
---p----- a------- ua(unicode)
---p----- a------- ua(typewriter)
---p----- a------- ua(phonetic)
---p----- a------- ua(rstu)
---p----- a------- ua(rstu_ru)
---p----- a------- ua(homophonic)
--dp----- a------- al(basic)
--dp----- a------- iq(basic)
---p----- a------- iq(ku)
---p----- a------- iq(ku_f)
---p----- a------- iq(ku_alt)
---p----- a------- iq(ku_ara)
--dp----- am------ pc(pc105)
-h-p----- a------- pc(function)
-h-p----- a------- pc(editing)
--dp----- am------ lv(basic)
---p----- am------ lv(apostrophe)
---p----- am------ lv(tilde)
---p----- am------ lv(fkey)
--dp----- a------- si(basic)
---p----- a------- si(us)
---p----- a------- si(alternatequotes)
---p----- a------- si(unicode)
---p----- a------- si(unicodeus)
--dp----- a------- by(basic)
---p----- a------- by(winkeys)
---p----- a------- by(latin)
--dp----- -m------ level3(ralt_switch)
---p----- -m------ level3(ralt_alt)
---p----- -m------ level3(ralt_switch_multikey)
-h-p----- -m------ level3(ralt_switch_for_alts_toggle)
---p----- -m------ level3(alt_switch)
---p----- -m------ level3(lalt_switch)
---p----- -m------ level3(switch)
---p----- -m------ level3(menu_switch)
---p----- -m------ level3(win_switch)
---p----- -m------ level3(lwin_switch)
---p----- -m------ level3(rwin_switch)
-h-p----- -m------ level3(enter_switch)
+--p----- --k----- keypad(ops)
+--p----- --k----- keypad(hex)
+--p----- --k----- keypad(atm)
+-dp----- a------- se(basic)
+--p----- a------- se(se)
+--p----- a------- se(nodeadkeys)
+--p----- a------- se(dvorak)
+--p----- a------- se(rus)
+--p----- a------- se(rus_nodeadkeys)
+-------- -------- se(smi)
+--p----- a------- se(mac)
+--p----- a------- se(svdvorak)
+-dp----- a------- dk(basic)
+--p----- a------- dk(nodeadkeys)
+--p----- a------- dk(mac)
+--p----- a------- dk(mac_nodeadkeys)
+--p----- a------- dk(dvorak)
+-dp----- a------- cn(basic)
+--p----- a------- cn(tib)
+--p----- a------- cn(tib_asciinum)
+-dp----- a------- uz(cyrillic)
+--p----- a------- uz(latin)
+--p----- -------- uz(crh)
+--p----- -------- uz(crh_f)
+--p----- -------- uz(crh_alt)
+-dp----- a------- sk(basic)
+-------- -------- sk(bksl)
+--p----- a------- sk(qwerty)
+-------- -------- sk(qwerty_bksl)
+-dp----- a------- me(basic)
+--p----- a------- me(cyrillic)
+--p----- a------- me(cyrillicyz)
+--p----- a------- me(latinunicode)
+--p----- a------- me(latinyz)
+--p----- a------- me(latinunicodeyz)
+-------- -------- me(cyrillicalternatequotes)
+-------- -------- me(latinalternatequotes)
+-dp----- a------- mk(basic)
+--p----- a------- mk(nodeadkeys)
+-dp----- a------- mn(basic)
+--p----- a------- mn(olpc)
+--p----- -m------ altwin(meta_alt)
+--p----- -m------ altwin(ctrl_win)
+--p----- -m------ altwin(ctrl_alt_win)
+--p----- -m------ altwin(meta_win)
+--p----- -m------ altwin(left_meta_win)
+--p----- -m------ altwin(hyper_win)
+--p----- -m------ altwin(menu)
+--p----- -m------ altwin(alt_super_win)
+--p----- -m------ altwin(swap_lalt_lwin)
 -------- am------ olpc(olpc)
--dp----- a------- pl(basic)
---p----- a------- pl(qwertz)
---p----- a------- pl(dvorak)
---p----- a------- pl(dvorak_quotes)
---p----- a------- pl(dvorak_altquotes)
---p----- a------- pl(csb)
---p----- a------- pl(ru_phonetic_dvorak)
--dp----- a------- gb(basic)
---p----- a------- gb(intl)
---p----- a------- gb(colemak)
---p----- a------- gb(dvorak)
---p----- a------- gb(dvorakukp)
---p----- a------- gb(mac)
--dp----- a------- in(deva)
---p----- a------- in(bolnagri)
---p----- a------- in(ben)
--------- -------- in(ben_probhat)
---p----- a------- in(guj)
---p----- a------- in(kan)
---p----- a------- in(mal)
---p----- a------- in(mal_lalitha)
---p----- a------- in(ori)
---p----- a------- in(tam)
---p----- a------- in(tam_unicode)
---p----- a------- in(tam_TSCII)
---p----- a------- in(tam_TAB)
---p----- a------- in(tel)
---p----- a------- in(urd)
---p----- a------- in(guru)
---p----- a------- in(jhelum)
---p----- a------- in(olpc)
---p----- -m------ shift(breaks_caps)
--dp----- a------- braille(home_row)
---p----- a------- braille(left_hand)
---p----- a------- braille(right_hand)
-h-p----- --k----- braille(keypad)
--dp----- a------- ch(basic)
---p----- a------- ch(de)
---p----- a------- ch(de_Sundeadkeys)
---p----- a------- ch(de_sundeadkeys)
---p----- a------- ch(de_nodeadkeys)
---p----- a------- ch(fr)
---p----- a------- ch(fr_Sundeadkeys)
---p----- a------- ch(fr_sundeadkeys)
---p----- a------- ch(fr_nodeadkeys)
---p----- a------- ch(de_mac)
---p----- a------- ch(fr_mac)
--------- -------- sgi_vndr/jp(jp106)
--------- -------- sgi_vndr/jp(alternate106)
--dp----- a------- macintosh_vndr/de(basic)
---p----- a------- macintosh_vndr/de(Sundeadkeys)
---p----- a------- macintosh_vndr/de(sundeadkeys)
---p----- a------- macintosh_vndr/de(nodeadkeys)
--dp----- a------- macintosh_vndr/fi(basic)
---p----- a------- macintosh_vndr/fi(nodeadkeys)
---p----- a------- macintosh_vndr/dk(basic)
--dp----- a------- macintosh_vndr/dk(full)
---p----- a------- macintosh_vndr/dk(nodeadkeys)
---p----- a------- macintosh_vndr/dk(macbookpro)
--dp----- a------- macintosh_vndr/latam(basic)
--dp----- a------- macintosh_vndr/no(basic)
---p----- a------- macintosh_vndr/no(nodeadkeys)
--dp----- a------- macintosh_vndr/gb(basic)
+-d------ -------- macintosh_vndr/fr(extended)
+-------- -------- macintosh_vndr/fr(nodeadkeys)
+-dp----- a------- macintosh_vndr/nl(basic)
 --p----- a------- macintosh_vndr/ch(extended)
 --p----- a------- macintosh_vndr/ch(de)
 --p----- a------- macintosh_vndr/ch(fr)
 --p----- a------- macintosh_vndr/ch(nodeadkeys)
+-dp----- a------- macintosh_vndr/no(basic)
+--p----- a------- macintosh_vndr/no(nodeadkeys)
+-dp----- a------- macintosh_vndr/es(basic)
+-dp----- a------- macintosh_vndr/is(basic)
+--p----- a------- macintosh_vndr/is(nodeadkeys)
+-dp----- a------- macintosh_vndr/gb(basic)
+-dp----- a------- macintosh_vndr/se(basic)
+--p----- a------- macintosh_vndr/se(nodeadkeys)
+--p----- a------- macintosh_vndr/dk(basic)
+-dp----- a------- macintosh_vndr/dk(full)
+--p----- a------- macintosh_vndr/dk(nodeadkeys)
+--p----- a------- macintosh_vndr/dk(macbookpro)
 -dp----- -m------ macintosh_vndr/apple(extended)
 --p----- -m------ macintosh_vndr/apple(laptop)
 --p----- -m------ macintosh_vndr/apple(laptop_bad_switch)
@@ -490,31 +518,17 @@ h-p----- --k----- braille(keypad)
 --p----- a------- macintosh_vndr/pt(Sundeadkeys)
 --p----- a------- macintosh_vndr/pt(sundeadkeys)
 --p----- a------- macintosh_vndr/pt(nodeadkeys)
--d------ -------- macintosh_vndr/fr(extended)
--------- -------- macintosh_vndr/fr(nodeadkeys)
--dp----- a------- macintosh_vndr/nl(basic)
--dp----- a------- macintosh_vndr/se(basic)
---p----- a------- macintosh_vndr/se(nodeadkeys)
 -------- -------- macintosh_vndr/us(extended)
 h------- -------- macintosh_vndr/us(oldmac)
--dp----- a------- macintosh_vndr/es(basic)
+-dp----- a------- macintosh_vndr/de(basic)
+--p----- a------- macintosh_vndr/de(Sundeadkeys)
+--p----- a------- macintosh_vndr/de(sundeadkeys)
+--p----- a------- macintosh_vndr/de(nodeadkeys)
 -------- -------- macintosh_vndr/it(extended)
--dp----- a------- macintosh_vndr/is(basic)
---p----- a------- macintosh_vndr/is(nodeadkeys)
--dp----- a------- bd(basic)
--------- -------- bd(probhat)
--dp----- -------- tr(basic)
---p----- -------- tr(f)
---p----- -------- tr(alt)
---p----- a------- tr(Sundeadkeys)
---p----- a------- tr(sundeadkeys)
---p----- -------- tr(ku)
---p----- -------- tr(ku_f)
---p----- -------- tr(ku_alt)
---p----- -------- tr(intl)
---p----- a------- tr(olpc)
--dp----- a------- tj(basic)
--dp----- a------- mao(basic)
+-dp----- a------- macintosh_vndr/latam(basic)
+-dp----- a------- macintosh_vndr/fi(basic)
+--p----- a------- macintosh_vndr/fi(nodeadkeys)
+--p----- -m------ level5(rctrl_switch)
 -dp----- a------- pt(basic)
 --p----- a------- pt(Sundeadkeys)
 --p----- a------- pt(sundeadkeys)
@@ -525,14 +539,81 @@ h------- -------- macintosh_vndr/us(oldmac)
 --p----- a------- pt(nativo)
 --p----- a------- pt(nativo-us)
 --p----- a------- pt(nativo-epo)
--dp----- a------- ara(basic)
---p----- a------- ara(qwerty)
---p----- a------- ara(azerty)
---p----- a------- ara(digits)
---p----- a------- ara(qwerty_digits)
---p----- a------- ara(azerty_digits)
---p----- a------- ara(buckwalter)
---p----- a------- ara(olpc)
+-dp----- a------- ge(basic)
+--p----- a------- ge(qwerty)
+--p----- a------- ge(ergonomic)
+--p----- a------- ge(mess)
+--p----- a------- ge(ru)
+--p----- a------- ge(os)
+-------- -------- sony_vndr/us(nwp5461)
+-dp----- am------ za(basic)
+-------- -------- hp_vndr/us(hil)
+-dp----- a------- ie(basic)
+--p----- a------- ie(CloGaelach)
+--p----- a------- ie(UnicodeExpert)
+--p----- a------- ie(ogam)
+--p----- a------- ie(ogam_is434)
+--p----- -m------ group(switch)
+--p----- -m------ group(lswitch)
+--p----- -m------ group(win_switch)
+--p----- -m------ group(lwin_switch)
+--p----- -m------ group(rwin_switch)
+--p----- -m------ group(rctrl_switch)
+--p----- -m------ group(toggle)
+--p----- -m------ group(shifts_toggle)
+--p----- -m------ group(ctrl_shift_toggle)
+--p----- -m------ group(lctrl_lshift_toggle)
+--p----- -m------ group(shift_caps_toggle)
+--p----- -m------ group(shift_caps_switch)
+--p----- -m------ group(win_menu_switch)
+--p----- -m------ group(ctrl_alt_toggle)
+--p----- -m------ group(alt_shift_toggle)
+--p----- -m------ group(menu_toggle)
+--p----- -m------ group(lwin_toggle)
+--p----- -m------ group(rwin_toggle)
+--p----- -m------ group(ctrls_toggle)
+--p----- -m------ group(alts_toggle)
+--p----- -m------ group(lshift_toggle)
+--p----- -m------ group(rshift_toggle)
+--p----- -m------ group(lalt_toggle)
+--p----- -m------ group(lctrl_toggle)
+--p----- -m------ group(rctrl_toggle)
+--p----- -m------ group(alt_caps_toggle)
+h-p----- -m------ group(olpc)
+--p----- -m------ group(alt_space_toggle)
+--p----- -m------ group(sclk_toggle)
+-dp----- am------ us(basic)
+--p----- a------- us(euro)
+--p----- a------- us(intl)
+--p----- a------- us(alt-intl)
+--p----- a------- us(dvorak)
+--p----- a------- us(dvorak-intl)
+--p----- a------- us(dvorak-l)
+--p----- a------- us(dvorak-r)
+--p----- a------- us(dvorak-classic)
+--p----- a------- us(dvp)
+--p----- a------- us(rus)
+--p----- a------- us(mac)
+--p----- a------- us(colemak)
+--p----- a------- us(altgr-intl)
+--p----- a------- us(classmate)
+--p----- a------- us(classmate-intl)
+--p----- a------- us(classmate-alt-intl)
+--p----- a------- us(classmate-altgr-intl)
+--p----- a------- us(olpc)
+--p----- a------- us(olpc2)
+--p----- am------ us(chr)
+-dp----- a------- et(basic)
+--p----- a------- et(olpc)
+-d------ -------- nec_vndr/jp(pc98)
+-dp----- a------- ma(arabic)
+--p----- a------- ma(french)
+--p----- a------- ma(tifinagh)
+--p----- a------- ma(tifinagh-phonetic)
+--p----- a------- ma(tifinagh-extended)
+--p----- a------- ma(tifinagh-extended-phonetic)
+--p----- a------- ma(tifinagh-alt)
+--p----- a------- ma(tifinagh-alt-phonetic)
 -dp----- -------- ca(fr)
 -------- -------- ca(fr-dvorak)
 --p----- -------- ca(fr-legacy)
@@ -543,26 +624,59 @@ h------- -------- macintosh_vndr/us(oldmac)
 --p----- a------- ca(shs)
 -------- -------- ca(olpc)
 --p----- a------- ca(kut)
--d------ -------- nec_vndr/jp(pc98)
+--p----- a------- ca(eng)
+--p----- -------- nbsp(none)
+--p----- -------- nbsp(level2)
+--p----- -------- nbsp(level3)
+--p----- -------- nbsp(level3s)
+--p----- -------- nbsp(level3n)
+--p----- -------- nbsp(level4)
+--p----- -------- nbsp(level4n)
+--p----- -------- nbsp(level4nl)
+-dp----- a------- ba(basic)
+--p----- a------- ba(us)
+--p----- a------- ba(alternatequotes)
+--p----- a------- ba(unicode)
+--p----- a------- ba(unicodeus)
+-dp----- a------- vn(basic)
+-d------ -------- de(basic)
+--p----- a------- de(nodeadkeys)
+--p----- a------- de(deadgraveacute)
+--p----- a------- de(deadacute)
+--p----- a------- de(ro)
+--p----- a------- de(ro_nodeadkeys)
+--p----- a------- de(dvorak)
+--p----- a------- de(Sundeadkeys)
+--p----- a------- de(sundeadkeys)
+--p----- amk----- de(neo)
+--p----- a------- de(mac)
+--p----- a------- de(mac_nodeadkeys)
+--p----- a------- de(dsb)
+--p----- a------- de(dsb_qwertz)
+--p----- a------- de(qwerty)
+-dp----- a------- it(basic)
+--p----- a------- it(nodeadkeys)
+--p----- a------- it(mac)
+--p----- a------- it(geo)
+-------- -------- it(olpc)
+-dp----- a------- bg(bds)
+--p----- a------- bg(phonetic)
+--p----- a------- bg(bas_phonetic)
 h-p----- a------- inet(media_common)
 h-p----- a------- inet(nav_common)
+h-p----- a------- inet(acpi_common)
 h-p----- a------- inet(media_nav_common)
+h-p----- a------- inet(media_nav_acpi_common)
+h-p----- a------- inet(nav_acpi_common)
+h-p----- a------- inet(media_acpi_common)
 --p----- a------- inet(evdev)
---p----- a------- inet(a4techKB21)
---p----- a------- inet(a4techKBS8)
---p----- a------- inet(a4_rfkb23)
 --p----- a------- inet(airkey)
 --p----- a------- inet(acer_c300)
 --p----- a------- inet(acer_ferrari4k)
 --p----- a------- inet(acer_laptop)
---p----- a------- inet(asus_laptop)
 --p----- a------- inet(azonaRF2300)
---p----- a------- inet(acpi)
---p----- a------- inet(scorpius)
 --p----- a------- inet(brother)
 --p----- a------- inet(btc5113rf)
---p----- a------- inet(btc5126t)
---p----- a------- inet(btc6301urf)
 --p----- a------- inet(btc9000)
 --p----- a------- inet(btc9000a)
 -------- -------- inet(btc9001ah)
@@ -572,8 +686,10 @@ h-p----- a------- inet(media_nav_common)
 --p----- a------- inet(cherryblueb)
 --p----- a------- inet(cherrybluea)
 --p----- a------- inet(cherrycyboard)
+--p----- a------- inet(cherrycmexpert)
 --p----- a------- inet(chicony)
 --p----- a------- inet(chicony0108)
+--p----- a------- inet(chicony0420)
 --p----- a------- inet(chicony9885)
 --p----- a------- inet(compaqeak8)
 --p----- a------- inet(compaqik7)
@@ -584,40 +700,29 @@ h-p----- a------- inet(media_nav_common)
 --p----- a------- inet(ipaq)
 --p----- a------- inet(dell)
 --p----- a------- inet(dellm65)
---p----- a------- inet(geniuskb19e)
 --p----- a------- inet(inspiron)
---p----- a------- inet(latitude)
---p----- a------- inet(precision_m)
 --p----- a------- inet(dellusbmm)
---p----- a------- inet(dexxa)
 --p----- a------- inet(diamond)
---p----- a------- inet(dtk2000)
 --p----- a------- inet(ennyah_dkb1008)
---p----- a------- inet(fscaa1667g)
 --p----- a------- inet(genius)
---p----- a------- inet(geniuscomfy)
 --p----- a------- inet(geniuscomfy2)
 --p----- a------- inet(gyration)
 --p----- a------- inet(hpi6)
---p----- a------- inet(hp2501)
---p----- a------- inet(hp2505)
---p----- a------- inet(hp5181)
---p----- a------- inet(hp5185)
+--p----- a------- inet(hp250x)
 --p----- a------- inet(hpxe3gc)
 --p----- a------- inet(hpxe3gf)
 --p----- a------- inet(hpxt1000)
 --p----- a------- inet(hpzt11xx)
+--p----- a------- inet(hpdv5)
 --p----- a------- inet(hpxe4xxx)
 --p----- a------- inet(hp500fa)
 --p----- a------- inet(hp5xx)
 --p----- a------- inet(honeywell_euroboard)
 --p----- a------- inet(rapidaccess)
 --p----- a------- inet(rapidaccess2)
---p----- a------- inet(rapidaccess2a)
---p----- a------- inet(thinkpad)
 --p----- a------- inet(thinkpad60)
 --p----- a------- inet(ibm_spacesaver)
---p----- a------- inet(logitech_base)
+h-p----- a------- inet(logitech_base)
 h-p----- a------- inet(logitech_set3)
 --p----- a------- inet(logiaccess)
 --p----- a------- inet(logicda)
@@ -631,12 +736,12 @@ h-p----- a------- inet(logitech_set3)
 --p----- a------- inet(logiultraxc)
 --p----- a------- inet(logidinovo)
 --p----- a------- inet(logidinovoedge)
+--p----- a------- inet(logitech_g15)
 --p----- a------- inet(mx1998)
 --p----- a------- inet(mx2500)
 --p----- a------- inet(mx2750)
 --p----- a------- inet(microsoft7000)
 --p----- a------- inet(microsoftinet)
---p----- a------- inet(microsoftpro)
 --p----- a------- inet(microsoftprousb)
 --p----- a------- inet(microsoftprooem)
 --p----- a------- inet(microsoftprose)
@@ -658,167 +763,31 @@ h-p----- a------- inet(logitech_set3)
 --p----- a------- inet(trust)
 --p----- a------- inet(trustda)
 --p----- a------- inet(yahoo)
--------- -------- inet(sp_inet)
---p----- -------- inet(apple)
+--p----- a------- inet(apple)
 --p----- a------- inet(cymotionlinux)
 --p----- a------- inet(silvercrest)
 --p----- a------- inet(emachines)
 --p----- a------- inet(benqx)
---p----- a------- inet(logitech_g15)
 --p----- a------- inet(classmate)
--dp----- a------- ir(basic)
-h-p----- a------- ir(part_pro)
-h-p----- a------- ir(part_keypad)
---p----- a------- ir(pro)
---p----- a------- ir(keypad)
---p----- a------- ir(pro_keypad)
---p----- a------- ir(ku)
---p----- a------- ir(ku_f)
---p----- a------- ir(ku_alt)
---p----- a------- ir(ku_ara)
--dp----- a------- fr(basic)
---p----- a------- fr(Sundeadkeys)
---p----- a------- fr(sundeadkeys)
---p----- a------- fr(nodeadkeys)
---p----- a------- fr(oss)
---p----- a------- fr(oss_latin9)
---p----- a------- fr(oss_Sundeadkeys)
---p----- a------- fr(oss_sundeadkeys)
---p----- a------- fr(oss_nodeadkeys)
---p----- a------- fr(latin9)
---p----- a------- fr(latin9_Sundeadkeys)
---p----- a------- fr(latin9_sundeadkeys)
---p----- a------- fr(latin9_nodeadkeys)
---p----- a------- fr(bepo)
---p----- a------- fr(bepo_latin9)
---p----- am------ fr(dvorak)
---p----- a------- fr(mac)
---p----- a------- fr(geo)
---p----- -------- nbsp(none)
---p----- -------- nbsp(level2)
---p----- -------- nbsp(level3)
---p----- -------- nbsp(level3s)
---p----- -------- nbsp(level3n)
---p----- -------- nbsp(level4)
---p----- -------- nbsp(level4n)
---p----- -------- nbsp(level4nl)
--dp----- a------- nl(basic)
---p----- a------- nl(std)
---p----- a------- nl(Sundeadkeys)
---p----- a------- nl(sundeadkeys)
---p----- a------- nl(mac)
--dp----- a------- cd(basic)
--dp----- a------- se(basic)
---p----- a------- se(se)
---p----- a------- se(nodeadkeys)
---p----- a------- se(dvorak)
---p----- a------- se(rus)
---p----- a------- se(rus_nodeadkeys)
--------- -------- se(smi)
---p----- a------- se(mac)
---p----- a------- se(svdvorak)
--dp----- am------ us(basic)
---p----- a------- us(euro)
---p----- a------- us(intl)
---p----- a------- us(alt-intl)
---p----- a------- us(dvorak)
---p----- a------- us(dvorak-intl)
---p----- a------- us(dvorak-l)
---p----- a------- us(dvorak-r)
---p----- a------- us(dvorak-classic)
---p----- a------- us(dvp)
---p----- a------- us(rus)
---p----- a------- us(mac)
---p----- a------- us(colemak)
---p----- a------- us(altgr-intl)
---p----- a------- us(classmate)
---p----- a------- us(classmate-intl)
---p----- a------- us(classmate-alt-intl)
---p----- a------- us(classmate-altgr-intl)
---p----- a------- us(olpc)
---p----- a------- us(olpc2)
---p----- am------ us(chr)
--dp----- a------- la(basic)
---p----- -m------ group(switch)
---p----- -m------ group(lswitch)
---p----- -m------ group(win_switch)
---p----- -m------ group(lwin_switch)
---p----- -m------ group(rwin_switch)
---p----- -m------ group(rctrl_switch)
---p----- -m------ group(toggle)
---p----- -m------ group(shifts_toggle)
---p----- -m------ group(ctrl_shift_toggle)
---p----- -m------ group(lctrl_lshift_toggle)
---p----- -m------ group(shift_caps_toggle)
---p----- -m------ group(shift_caps_switch)
---p----- -m------ group(ctrl_alt_toggle)
---p----- -m------ group(alt_shift_toggle)
---p----- -m------ group(menu_toggle)
---p----- -m------ group(lwin_toggle)
---p----- -m------ group(rwin_toggle)
---p----- -m------ group(ctrls_toggle)
---p----- -m------ group(alts_toggle)
---p----- -m------ group(lshift_toggle)
---p----- -m------ group(rshift_toggle)
---p----- -m------ group(lalt_toggle)
---p----- -m------ group(lctrl_toggle)
---p----- -m------ group(rctrl_toggle)
---p----- -m------ group(alt_caps_toggle)
-h-p----- -m------ group(olpc)
--dp----- am------ za(basic)
--dp----- a------- vn(basic)
--dp----- a------- es(basic)
---p----- a------- es(Sundeadkeys)
---p----- a------- es(sundeadkeys)
---p----- a------- es(nodeadkeys)
---p----- a------- es(dvorak)
---p----- a------- es(cat)
---p----- a------- es(ast)
---p----- a------- es(mac)
---p----- a------- es(olpc)
--dp----- a------- it(basic)
---p----- a------- it(nodeadkeys)
---p----- a------- it(mac)
---p----- a------- it(geo)
--------- -------- it(olpc)
--dp----- a------- th(basic)
---p----- a------- th(pat)
---p----- a------- th(tis)
---p----- a------- th(olpc)
--dp----- a------- pk(urd)
---p----- a------- pk(ara)
---p----- a------- pk(olpc)
--dp----- a------- is(basic)
---p----- a------- is(Sundeadkeys)
---p----- a------- is(nodeadkeys)
---p----- a------- is(mac)
---p----- a------- is(dvorak)
--dp----- a------- np(basic)
---p----- a------- np(olpc)
--dp----- a------- kg(basic)
--dp----- a------- ad(basic)
--dp----- a------- mt(basic)
---p----- a------- mt(us)
--dp----- a------- ru(winkeys)
-h-p----- a------- ru(common)
---p----- a------- ru(legacy)
---p----- a------- ru(olpc)
---p----- a------- ru(typewriter)
---p----- a------- ru(phonetic)
---p----- a------- ru(tt)
---p----- a------- ru(os_legacy)
---p----- a------- ru(os_winkeys)
---p----- a------- ru(cv)
---p----- a------- ru(udm)
---p----- a------- ru(cv_latin)
---p----- a------- ru(kom)
---p----- a------- ru(sah)
--d------ -------- digital_vndr/lk(common)
--------- -------- digital_vndr/lk(lk401)
+--p----- a------- inet(unitekkb1925)
+--p----- a------- inet(compalfl90)
+--p----- a------- inet(pc105)
+-dp----- a------- latam(basic)
+--p----- a------- latam(Sundeadkeys)
+--p----- a------- latam(sundeadkeys)
+--p----- a------- latam(nodeadkeys)
+--p----- a------- latam(deadtilde)
+-dp----- a------- sy(basic)
+--p----- a------- sy(syc)
+--p----- a------- sy(syc_phonetic)
+--p----- a------- sy(ku)
+--p----- a------- sy(ku_f)
+--p----- a------- sy(ku_alt)
+-dp----- a------- lk(sin_phonetic)
+--p----- a------- lk(tam_unicode)
+--p----- a------- lk(tam_TAB)
 -------- -------- digital_vndr/pc(pc)
 -------- -------- digital_vndr/pc(pc104)
--------- -------- digital_vndr/vt(vt105)
--------- -------- digital_vndr/vt(vt108)
 -------- -------- digital_vndr/us(us)
 -------- -------- digital_vndr/us(vt105-tw)
 -------- -------- digital_vndr/us(vt105-dp)
@@ -834,21 +803,79 @@ h-p----- a------- ru(common)
 -------- -------- digital_vndr/us(pcxalka)
 -------- -------- digital_vndr/us(lk44x)
 -------- -------- digital_vndr/us(pc104)
--dp----- a------- epo(basic)
---p----- a------- epo(legacy)
-hdp----- -m------ capslock(capslock)
-h-p----- -m------ capslock(shiftlock)
-h-p----- -m------ capslock(grouplock)
-h-p----- -m------ capslock(swapescape)
-h-p----- -m------ capslock(groupshift)
--dp----- a------- mk(basic)
---p----- a------- mk(nodeadkeys)
--dp----- a------- uz(cyrillic)
---p----- a------- uz(latin)
--dp----- a------- ee(basic)
---p----- a------- ee(nodeadkeys)
---p----- a------- ee(dvorak)
---p----- a------- ee(us)
+-d------ -------- digital_vndr/lk(common)
+-------- -------- digital_vndr/lk(lk401)
+-------- -------- digital_vndr/vt(vt105)
+-------- -------- digital_vndr/vt(vt108)
+-dp----- a------- be(basic)
+--p----- a------- be(oss)
+--p----- a------- be(oss_frbe)
+--p----- a------- be(oss_latin9)
+--p----- a------- be(oss_Sundeadkeys)
+--p----- a------- be(oss_sundeadkeys)
+--p----- a------- be(iso-alternate)
+--p----- a------- be(sundeadkeys)
+--p----- a------- be(Sundeadkeys)
+--p----- a------- be(nodeadkeys)
+--p----- a------- be(wang)
+-dp----- a------- mv(basic)
+-dp----- a------- ru(winkeys)
+h-p----- a------- ru(common)
+--p----- a------- ru(legacy)
+--p----- a------- ru(olpc)
+--p----- a------- ru(typewriter)
+--p----- a------- ru(phonetic)
+--p----- a------- ru(phonetic_winkeys)
+--p----- a------- ru(tt)
+--p----- a------- ru(os_legacy)
+--p----- a------- ru(os_winkeys)
+--p----- a------- ru(cv)
+--p----- a------- ru(udm)
+--p----- a------- ru(cv_latin)
+--p----- a------- ru(kom)
+--p----- a------- ru(sah)
+--p----- a------- ru(xal)
+--p----- a------- ru(dos)
+-dp----- am------ lv(basic)
+--p----- am------ lv(apostrophe)
+--p----- am------ lv(tilde)
+--p----- am------ lv(fkey)
+-dp----- a------- si(basic)
+--p----- a------- si(us)
+--p----- a------- si(alternatequotes)
+-dp----- a------- bt(basic)
+--p----- -m------ compose(ralt)
+--p----- -m------ compose(lwin)
+--p----- -m------ compose(rwin)
+--p----- -m------ compose(menu)
+--p----- -m------ compose(rctrl)
+--p----- -m------ compose(caps)
+--p----- -m------ compose(102)
+-dp----- a------- az(latin)
+--p----- a------- az(cyrillic)
+--p----- -m------ ctrl(nocaps)
+--p----- -m------ ctrl(swapcaps)
+--p----- -m------ ctrl(ctrl_ac)
+--p----- -m------ ctrl(ctrl_aa)
+--p----- -m------ ctrl(ctrl_ra)
+-dp----- a------- brai(home_row)
+--p----- a------- brai(left_hand)
+--p----- a------- brai(right_hand)
+h-p----- --k----- brai(keypad)
+-dp----- -------- tm(basic)
+--p----- -------- tm(alt)
+-dp----- a------- kz(basic)
+--p----- a------- kz(ruskaz)
+--p----- a------- kz(kazrus)
+--p----- a------- kz(olpc)
+-dp----- a------- la(basic)
+-dp----- a------- fi(kotoistus)
+--p----- a------- fi(classic)
+h-p----- a------- fi(fi)
+--p----- a------- fi(nodeadkeys)
+-------- -------- fi(smi)
+--p----- a------- fi(mac)
+-dp----- a------- al(basic)
 -dp----- a------- gh(basic)
 --p----- a------- gh(akan)
 --p----- a------- gh(ga)
@@ -856,3 +883,8 @@ h-p----- -m------ capslock(groupshift)
 --p----- a------- gh(fula)
 --p----- a------- gh(hausa)
 --p----- a------- gh(generic)
+-------- -------- fujitsu_vndr/jp
+-------- -------- fujitsu_vndr/us
+-dp----- a------- kg(basic)
+--p----- a------- kg(phonetic)
+--p----- -m------ shift(breaks_caps)
diff --git a/xorg-server/xkbdata.src/symbols/terminate b/xorg-server/xkbdata.src/symbols/terminate
new file mode 100644
index 000000000..47e434d7f
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/terminate
@@ -0,0 +1,8 @@
+partial default modifier_keys
+xkb_symbols "ctrl_alt_bksp" {
+    key <BKSP> {
+        type="CTRL+ALT",
+        symbols[Group1] = [ NoSymbol,        Terminate_Server ]
+    };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/tj b/xorg-server/xkbdata.src/symbols/tj
index f07b29001..0dcb29d43 100644
--- a/xorg-server/xkbdata.src/symbols/tj
+++ b/xorg-server/xkbdata.src/symbols/tj
@@ -1,78 +1,139 @@
 // $XKeyboardConfig$
 
-// based on
-// Tajik keyboard 
-// it is a Russian layout keyboard, with SHCHA replaced with 
-// dead_cedilla/dead_macron
-// that allows to type the SHCHA with dead_cedilla + SHA
-// and all the extra Tajik keys:
-// dead_cedilla + KA, HA --> KA descender, HA descender
-// dead_macron + I, U, GHE --> I macron, U macron, GHE horizontal stroke
-// it requires proper dead_cedilla and dead_macron entries in Compose file
-// it also allows to use Mode_switch when in cyrillic mode to enter
-// special letters by doing Mode_switch + base letter
+// 17/07/2008
+// -------------------------------------------------------------
+// Standard Tojiki Keyboard Layout, Official Standard
+// -------------------------------------------------------------
+// Created by Victor Ibragimov <victor.ibragimov@gmail.com>
+// Tajik Fedora & Software Localization Team
+// -------------------------------------------------------------
+//                        DUAL INPUT METHOD
+// --------------------------------------------------------------------
+// -------------- Tajiki Official Keyboard Layout----------------------
+// --------------------------------------------------------------------
 //
-// AEN <aen@logic.ru> (for the Russian layout)
-// Pablo Saratxaga <pablo@mandrakesoft> (for the dead keys changes)
-//
-// 2008-06-22
-// Changed so that RightAlt allows to type the extra Tajik keys and that
-// SHCHA is back to normal again
 
+partial default alphanumeric_keys
+xkb_symbols "basic"
+{
+	name[Group1] = "Tajikistan";
+
+    	include "kpdl(comma)"
+	include "level3(ralt_switch)"
 
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
+	key <AB01> { [    Cyrillic_ya,    Cyrillic_YA                                 ] }; // я Я 
+	key <AB02> { [   Cyrillic_che,   Cyrillic_CHE                                 ] }; // ч Ч 
+	key <AB03> { [    Cyrillic_es,    Cyrillic_ES                                 ] }; // с С 
+	key <AB04> { [    Cyrillic_em,    Cyrillic_EM                                 ] }; // м М 
+	key <AB05> { [     Cyrillic_i,     Cyrillic_I                                 ] }; // и И 
+	key <AB06> { [    Cyrillic_te,    Cyrillic_TE                                 ] }; // т Т 
+	key <AB07> { [      0x10004e3,      0x10004e2                                 ] }; // ӣ Ӣ 
+	key <AB08> { [    Cyrillic_be,    Cyrillic_BE                                 ] }; // б Б 
+	key <AB09> { [    Cyrillic_yu,    Cyrillic_YU                                 ] }; // ю Ю 
+	key <AB10> { [         period,          comma                                 ] }; // . , 
+	key <AC01> { [    Cyrillic_ef,    Cyrillic_EF                                 ] }; // ф Ф 
+	key <AC02> { [      0x10004b7,      0x10004b6                                 ] }; // ҷ Ҷ 
+	key <AC03> { [    Cyrillic_ve,    Cyrillic_VE                                 ] }; // в В 
+	key <AC04> { [     Cyrillic_a,     Cyrillic_A                                 ] }; // а А 
+	key <AC05> { [    Cyrillic_pe,    Cyrillic_PE                                 ] }; // п П 
+	key <AC06> { [    Cyrillic_er,    Cyrillic_ER                                 ] }; // р Р 
+	key <AC07> { [     Cyrillic_o,     Cyrillic_O                                 ] }; // о О 
+	key <AC08> { [    Cyrillic_el,    Cyrillic_EL                                 ] }; // л Л 
+	key <AC09> { [    Cyrillic_de,    Cyrillic_DE                                 ] }; // д Д 
+	key <AC10> { [   Cyrillic_zhe,   Cyrillic_ZHE                                 ] }; // ж Ж 
+	key <AC11> { [     Cyrillic_e,     Cyrillic_E                                 ] }; // э Э 
+	key <AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI                               ] }; // й Й 
+	key <AD02> { [      0x100049b,      0x100049a                                 ] }; // қ Қ 
+	key <AD03> { [     Cyrillic_u,     Cyrillic_U                                 ] }; // у У 
+	key <AD04> { [    Cyrillic_ka,    Cyrillic_KA                                 ] }; // к К 
+	key <AD05> { [    Cyrillic_ie,    Cyrillic_IE                                 ] }; // е Е 
+	key <AD06> { [    Cyrillic_en,    Cyrillic_EN                                 ] }; // н Н 
+	key <AD07> { [   Cyrillic_ghe,   Cyrillic_GHE                                 ] }; // г Г 
+	key <AD08> { [   Cyrillic_sha,   Cyrillic_SHA                                 ] }; // ш Ш 
+	key <AD09> { [      0x10004b3,      0x10004b2                                 ] }; // ҳ Ҳ 
+	key <AD10> { [    Cyrillic_ze,    Cyrillic_ZE                                 ] }; // з З 
+	key <AD11> { [    Cyrillic_ha,    Cyrillic_HA                                 ] }; // х Х 
+	key <AD12> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN                           ] }; // ъ Ъ 
+	key <AE01> { [              1,         exclam,      0x10000a7                 ] }; // 1 ! § 
+	key <AE02> { [              2,       quotedbl,      0x10000ab,      0x10000bb ] }; // 2 " « » 
+	key <AE03> { [              3,     numerosign                                 ] }; // 3 № 
+	key <AE04> { [              4,      semicolon                                 ] }; // 4 ; 
+	key <AE05> { [              5,        percent                                 ] }; // 5 % 
+	key <AE06> { [              6,          colon,      0x1002013                 ] }; // 6 : – 
+	key <AE07> { [              7,       question,      ampersand                 ] }; // 7 ? & 
+	key <AE08> { [              8,       asterisk                                 ] }; // 8 * 
+	key <AE09> { [              9,      parenleft                                 ] }; // 9 ( 
+	key <AE10> { [              0,     parenright,      0x10000b0                 ] }; // 0 ) ° 
+	key <AE11> { [      0x1000493,      0x1000492,          minus,     underscore ] }; // ғ Ғ - _ 
+	key <AE12> { [      0x10004ef,      0x10004ee,          equal,           plus ] }; // ӯ Ӯ = + 
+	key <BKSL> { [      backslash,          slash                                 ] }; // \ / 
+	key <LSGT> { [          slash,            bar                                 ] }; // / | 
+	key <TLDE> { [    Cyrillic_io,    Cyrillic_IO                                 ] }; // ё Ё 
+};
 
-    name[Group1]= "Tajikistan";
+// --------------------------------------------------------------------
+// -------------- Tojiki Rusi Keyboard Layout--------------------------
+// --------------------------------------------------------------------
+// AEN <aen@logic.ru>
+// 2001/12/23 by Leon Kanter <leon@blackcatlinux.com>
+// 2005/12/09 Valery Inozemtsev <shrek@altlinux.ru>
+// Pablo Saratxaga <pablo@mandrakesoft> (for the dead keys changes)
+// --------------------------------------------------------------------
 
-    key	<AB01> {	[     Cyrillic_ya,     Cyrillic_YA	]	};
-    key	<AB02> {	[    Cyrillic_che,    Cyrillic_CHE,     0x010004b7,      0x010004b6	]	 };
-    key	<AB03> {	[     Cyrillic_es,     Cyrillic_ES	]	};
-    key	<AB04> {	[     Cyrillic_em,     Cyrillic_EM	]	};
-    key	<AB05> {	[      Cyrillic_i,	Cyrillic_I,     0x010004e3,      0x010004e2	]	 };
-    key	<AB06> {	[     Cyrillic_te,     Cyrillic_TE	]	};
-    key	<AB07> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};
-    key	<AB08> {	[     Cyrillic_be,     Cyrillic_BE	]	};
-    key	<AB09> {	[     Cyrillic_yu,     Cyrillic_YU	]	};
-    key	<AB10> {	[	    slash,	  question	]	};
-    key	<AC01> {	[     Cyrillic_ef,     Cyrillic_EF	]	};
-    key	<AC02> {	[   Cyrillic_yeru,   Cyrillic_YERU	]	};
-    key	<AC03> {	[     Cyrillic_ve,     Cyrillic_VE	]	};
-    key	<AC04> {	[      Cyrillic_a,	Cyrillic_A	]	};
-    key	<AC05> {	[     Cyrillic_pe,     Cyrillic_PE	]	};
-    key	<AC06> {	[     Cyrillic_er,     Cyrillic_ER	]	};
-    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O	]	};
-    key	<AC08> {	[     Cyrillic_el,     Cyrillic_EL	]	};
-    key	<AC09> {	[     Cyrillic_de,     Cyrillic_DE	]	};
-    key	<AC10> {	[    Cyrillic_zhe,    Cyrillic_ZHE,     0x01000497,      0x01000496	]	 };
-    key	<AC11> {	[      Cyrillic_e,	Cyrillic_E	]	};
-    key	<AD01> {	[ Cyrillic_shorti, Cyrillic_SHORTI	]	};
-    key	<AD02> {	[    Cyrillic_tse,    Cyrillic_TSE	]	};
-    key	<AD03> {	[      Cyrillic_u,	Cyrillic_U,     0x010004ef,      0x010004ee	]	 };
-    key	<AD04> {	[     Cyrillic_ka,     Cyrillic_KA,     0x0100049b,      0x0100049a	]	 };
-    key	<AD05> {	[     Cyrillic_ie,     Cyrillic_IE	]	};
-    key	<AD06> {	[     Cyrillic_en,     Cyrillic_EN	]	};
-    key	<AD07> {	[    Cyrillic_ghe,    Cyrillic_GHE,     0x01000493,      0x01000492	]	 };
-    key	<AD08> {	[    Cyrillic_sha,    Cyrillic_SHA,     Cyrillic_shcha,  Cyrillic_SHCHA]	 };
-    key	<AD09> {	[    Cyrillic_shcha, Cyrillic_SHCHA	]	};
-    key	<AD10> {	[     Cyrillic_ze,     Cyrillic_ZE	]	};
-    key	<AD11> {	[     Cyrillic_ha,     Cyrillic_HA,     0x010004b3,      0x010004b2	]	 };
-    key	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN	]	};
-    key	<AE01> {	[		1,	    exclam 	]	};
-    key	<AE02> {	[		2,        quotedbl	]	};
-    key	<AE03> {	[		3,      apostrophe	]	};
-    key	<AE04> {	[		4,        asterisk	]	};
-    key	<AE05> {	[		5,	     colon	]	};
-    key	<AE06> {	[		6,	     comma	]	};
-    key	<AE07> {	[		7,	    period	]	};
-    key	<AE08> {	[		8,	 semicolon	]	};
-    key	<AE09> {	[		9,	 parenleft	]	};
-    key	<AE10> {	[		0,	parenright	]	};
-    key	<AE11> {	[	    minus,	underscore	]	};
-    key	<AE12> {	[	    equal,	      plus	]	};
-    key	<LSGT> {	[	      bar,	 brokenbar	]	};
-    key	<TLDE> {	[     Cyrillic_io,     Cyrillic_IO	]	};
+xkb_symbols "legacy"
+{
+	name[Group1] = "Tajikistan - Legacy";
 
-    // End alphanumeric section
+	include "kpdl(comma)"
+	include "level3(ralt_switch)"
 
+	key <AB01> { [    Cyrillic_ya,    Cyrillic_YA                                 ] }; // я Я 
+	key <AB02> { [   Cyrillic_che,   Cyrillic_CHE,      0x10004b7,      0x10004b6 ] }; // ч Ч ҷ Ҷ 
+	key <AB03> { [    Cyrillic_es,    Cyrillic_ES                                 ] }; // с С 
+	key <AB04> { [    Cyrillic_em,    Cyrillic_EM                                 ] }; // м М 
+	key <AB05> { [     Cyrillic_i,     Cyrillic_I,      0x10004e3,      0x10004e2 ] }; // и И ӣ Ӣ 
+	key <AB06> { [    Cyrillic_te,    Cyrillic_TE                                 ] }; // т Т 
+	key <AB07> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN                           ] }; // ь Ь 
+	key <AB08> { [    Cyrillic_be,    Cyrillic_BE                                 ] }; // б Б 
+	key <AB09> { [    Cyrillic_yu,    Cyrillic_YU                                 ] }; // ю Ю 
+	key <AB10> { [         period,          comma                                 ] }; // . , 
+	key <AC01> { [    Cyrillic_ef,    Cyrillic_EF                                 ] }; // ф Ф 
+	key <AC02> { [  Cyrillic_yeru,  Cyrillic_YERU                                 ] }; // ы Ы 
+	key <AC03> { [    Cyrillic_ve,    Cyrillic_VE                                 ] }; // в В 
+	key <AC04> { [     Cyrillic_a,     Cyrillic_A                                 ] }; // а А 
+	key <AC05> { [    Cyrillic_pe,    Cyrillic_PE                                 ] }; // п П 
+	key <AC06> { [    Cyrillic_er,    Cyrillic_ER                                 ] }; // р Р 
+	key <AC07> { [     Cyrillic_o,     Cyrillic_O                                 ] }; // о О 
+	key <AC08> { [    Cyrillic_el,    Cyrillic_EL                                 ] }; // л Л 
+	key <AC09> { [    Cyrillic_de,    Cyrillic_DE                                 ] }; // д Д 
+	key <AC10> { [   Cyrillic_zhe,   Cyrillic_ZHE                                 ] }; // ж Ж 
+	key <AC11> { [     Cyrillic_e,     Cyrillic_E                                 ] }; // э Э 
+	key <AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI                               ] }; // й Й 
+	key <AD02> { [   Cyrillic_tse,   Cyrillic_TSE                                 ] }; // ц Ц 
+	key <AD03> { [     Cyrillic_u,     Cyrillic_U,      0x10004ef,      0x10004ee ] }; // у У ӯ Ӯ 
+	key <AD04> { [    Cyrillic_ka,    Cyrillic_KA,      0x100049b,      0x100049a ] }; // к К қ Қ 
+	key <AD05> { [    Cyrillic_ie,    Cyrillic_IE                                 ] }; // е Е 
+	key <AD06> { [    Cyrillic_en,    Cyrillic_EN                                 ] }; // н Н 
+	key <AD07> { [   Cyrillic_ghe,   Cyrillic_GHE,      0x1000493,      0x1000492 ] }; // г Г ғ Ғ 
+	key <AD08> { [   Cyrillic_sha,   Cyrillic_SHA                                 ] }; // ш Ш 
+	key <AD09> { [ Cyrillic_shcha, Cyrillic_SHCHA                                 ] }; // щ Щ 
+	key <AD10> { [    Cyrillic_ze,    Cyrillic_ZE                                 ] }; // з З 
+	key <AD11> { [    Cyrillic_ha,    Cyrillic_HA,      0x10004b3,      0x10004b2 ] }; // х Х ҳ Ҳ 
+	key <AD12> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN                           ] }; // ъ Ъ 
+	key <AE01> { [              1,         exclam,      0x10000a7                 ] }; // 1 ! § 
+	key <AE02> { [              2,       quotedbl,      0x10000ab,      0x10000bb ] }; // 2 " « » 
+	key <AE03> { [              3,     numerosign                                 ] }; // 3 № 
+	key <AE04> { [              4,      semicolon                                 ] }; // 4 ; 
+	key <AE05> { [              5,        percent                                 ] }; // 5 % 
+	key <AE06> { [              6,          colon,      0x1002013                 ] }; // 6 : – 
+	key <AE07> { [              7,       question,      ampersand                 ] }; // 7 ? & 
+	key <AE08> { [              8,       asterisk                                 ] }; // 8 * 
+	key <AE09> { [              9,      parenleft                                 ] }; // 9 ( 
+	key <AE10> { [              0,     parenright                                 ] }; // 0 ) 
+	key <AE11> { [          minus,     underscore                                 ] }; // - _ 
+	key <AE12> { [          equal,           plus                                 ] }; // = + 
+	key <BKSL> { [      backslash,          slash                                 ] }; // \ / 
+	key <LSGT> { [          slash,            bar                                 ] }; // / | 
+	key <TLDE> { [    Cyrillic_io,    Cyrillic_IO                                 ] }; // ё Ё 
 };
+
diff --git a/xorg-server/xkbdata.src/symbols/tm b/xorg-server/xkbdata.src/symbols/tm
new file mode 100644
index 000000000..d66e277f0
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/tm
@@ -0,0 +1,50 @@
+// $XKeyboardConfig$
+
+// $XFree86: xc/programs/xkbcomp/symbols/tm,v 0.2 2009/04/02 14:32:05 pascal Exp $
+// Nazar Annagurban <nazar_xg@hotmail.com>, 2009
+
+// Default layout (based on Vista Turkmen layout)
+default partial
+xkb_symbols "basic" {
+    name[Group1]="Turkmenistan";
+    
+    include "us"
+    
+    key <TLDE> {	[    zcaron, 	Zcaron,		grave,	asciitilde	]	};
+
+    key <AD01> {	[ adiaeresis, 	Adiaeresis,	q,	Q 	]	};
+    key <AD11> {	[    ncaron, 	Ncaron,		bracketleft,	braceleft	]	};
+    key <AD12> {	[odiaeresis, 	Odiaeresis, 	bracketright,	braceright	]	};
+
+    key <AB02> {	[udiaeresis, 	Udiaeresis,	x,	X	]	};
+    key <AB03> {	[  ccedilla, 	Ccedilla,	c,	C	]	};
+    key <AB04> {	[    yacute, 	Yacute, 	v,	V	]	};
+
+    key <BKSL> {	[  scedilla, 	Scedilla,	backslash,         bar	]	};
+
+    include "level3(ralt_switch)"
+};
+
+// Turkmen Alt-Q Layout
+// This layout provides turkmen letter via the AltGr key
+partial
+xkb_symbols "alt" {
+    name[Group1]="Turkmenistan - Alt-Q";
+
+    include "us"
+
+    key <AD06> {	[	  y,	Y,	yacute,		Yacute		]	};
+    key <AD07> {	[	  u,	U,	udiaeresis,	Udiaeresis	]	};
+    key <AD09> {	[	  o,	O,	odiaeresis,	Odiaeresis	]	};
+
+    key <AC01> {	[	  a,	A,	adiaeresis,	Adiaeresis	]	};
+    key <AC02> {	[	  s,	S,	scedilla,	Scedilla	]	};
+
+    key <AB01> {	[	  z,	Z,	zcaron,		Zcaron		]	};
+    key <AB03> {	[  	  c,	C,	ccedilla,	Ccedilla	]	};
+    key <AB06> {	[	  n,	N,	ncaron,		Ncaron		]	};
+
+    include "level3(ralt_switch)"
+
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/tr b/xorg-server/xkbdata.src/symbols/tr
index 1fcf0cc56..68672aa11 100644
--- a/xorg-server/xkbdata.src/symbols/tr
+++ b/xorg-server/xkbdata.src/symbols/tr
@@ -268,8 +268,7 @@ xkb_symbols "intl" {
     key <BKSL>	{ type[group1] = "FOUR_LEVEL",[     comma,  semicolon,   dead_grave, dead_grave ]	};
     key <LSGT>	{ type[group1] = "FOUR_LEVEL",[     less,     greater,   bar,    brokenbar ]	};
     key <AB08>	{ [odiaeresis, Odiaeresis,     multiply,   VoidSymbol ]	};
-    key <AB09>	{ [  ccedilla,   Ccedilla, periodcentered,     division ] 
-};
+    key <AB09>	{ [  ccedilla,   Ccedilla, periodcentered,   division ]	};
     key <AB10>	{ type[group1] = "FOUR_LEVEL",[    period,      colon, dead_abovedot, dead_abovedot ] };
 
     include "nbsp(level3)"
@@ -280,7 +279,76 @@ xkb_symbols "intl" {
 partial alphanumeric_keys
 xkb_symbols "olpc" {
     name[Group1]= "Turkey";
+    include "tr(intl)"
+
+    key <AE01>	{ [         1,    exclam,    VoidSymbol,    VoidSymbol ] };
+    key <AE06>	{ [         6,  ampersand, VoidSymbol,  VoidSymbol ]	};
+    key <AE12>	{ type[group1] = "FOUR_LEVEL", [     minus, underscore, bar,    VoidSymbol ]	};
+
+
+    key <AB03>  { [         c,           C,     leftdoublequotemark,     VoidSymbol ] };
+    key <AB04>  { [         v,           V,     rightdoublequotemark,     VoidSymbol ] };
+    key <AB05>  { [         b,           B,     VoidSymbol,     VoidSymbol ] };
+    key <AB08>	{ [odiaeresis, Odiaeresis,     VoidSymbol,   VoidSymbol ]	};
+
+    key <AB09>	{ [  ccedilla,   Ccedilla, multiply,     VoidSymbol ] };
+    key <AB10>	{ [    period,      colon, division, dead_abovedot ] };
+
+    key <I219> { [  less,  greater, VoidSymbol, VoidSymbol ] };
+
+};
+
+// Crimean Tatar (Crimean Turkish) layouts. 
+// These layouts are currently experimental. In particular, the mapping of letter 'x', 
+// included for foreign words and shortcuts, might change in the future...
+// Reşat SABIQ <tilde.birlik@gmail.com>, 2009
+
+// Crimean Tatar (Crimean Turkish) Q Layout
+partial
+xkb_symbols "crh" {
+
+    include "tr(basic)"
+
+    name[Group1]="Turkey - Crimean Tatar (Turkish Q)";
+
+    key <AE11>	{ [         x,          X,          asterisk,      question ]   };
+
+    key <AC04>	{ [         f,          F,          iacute,          Iacute ]	};
+    key <AC07>	{ [         j,          J,          ibreve,          Ibreve ]	};
+    key <TLDE>	{ [  quotedbl,  backslash,            less,          degree ]	};
+
+    key <AB02>	{ [    ntilde,     Ntilde,  guillemotright,         greater ]	};
+};
+
+// Crimean Tatar (Crimean Turkish) F Layout
+partial
+xkb_symbols "crh_f" {
+
     include "tr(f)"
 
-    key <I219> { [  less,  greater, bar, brokenbar ] };
+    name[Group1]="Turkey - Crimean Tatar (Turkish F)";
+
+    key <AE11>	{ [         x,          X,           slash,        question ]	};
+
+    key <AD04>	{ type[group1] = "FOUR_LEVEL_SEMIALPHABETIC",
+                  [  idotless,          I,          iacute,          Iacute ]	};
+
+    key <AC07>	{ [         k,          K,          ibreve,          Ibreve ]	};
+    key <TLDE>	{ [      plus,   asterisk,       backslash,       plusminus ]	};
+
+    key <BKSL>	{ [    ntilde,     Ntilde,           grave,      dead_grave ]	};
+};
+
+// Crimean Tatar (Crimean Turkish) Alt-Q Layout
+partial
+xkb_symbols "crh_alt" {
+
+    include "tr(alt)"
+
+    name[Group1]="Turkey - Crimean Tatar (Turkish Alt-Q)";
+
+    key <AC04>	{ [         f,          F,          iacute,          Iacute ]	};
+    key <AC07>	{ [         j,          J,          ibreve,          Ibreve ]	};
+
+    key <AB06>	{ [         n,          N,          ntilde,          Ntilde ]	};
 };
diff --git a/xorg-server/xkbdata.src/symbols/typo b/xorg-server/xkbdata.src/symbols/typo
new file mode 100644
index 000000000..eb6fbc4ac
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/typo
@@ -0,0 +1,53 @@
+// $XKeyboardConfig$
+
+// typographic keyboard
+// Sergei Stolyarov <sergei@regolit.com>
+//
+// Initial contribution by Alexey Ten <alexeyten+deb@gmail.com>
+//
+// Based on the layout proposed by Ilya Birman, 
+// http://ilyabirman.ru/typography-layout/
+//
+
+// default layout
+default partial
+xkb_symbols "base" {
+// 1st keyboard row
+    key <TLDE> { [NoSymbol, NoSymbol, NoSymbol, approxeq] };
+    key <AE01> { [NoSymbol, NoSymbol, onesuperior] };
+    key <AE02> { [NoSymbol, NoSymbol, twosuperior, onehalf] };
+    key <AE03> { [NoSymbol, NoSymbol, threesuperior, onethird] };
+    key <AE04> { [NoSymbol, NoSymbol, dollar, onequarter] };
+    key <AE05> { [NoSymbol, NoSymbol, U2030] };
+    key <AE07> { [NoSymbol, NoSymbol, ampersand] };
+    key <AE08> { [NoSymbol, NoSymbol, enfilledcircbullet, oneeighth] };
+    key <AE11> { [NoSymbol, NoSymbol, emdash, hyphen] };
+    key <AE12> { [NoSymbol, NoSymbol, notequal, plusminus] };
+
+// 2nd keyboard row
+    key <AD03> { [NoSymbol, NoSymbol, EuroSign] }; // "e"
+    key <AD04> { [NoSymbol, NoSymbol, registered] }; // "r"
+    key <AD05> { [NoSymbol, NoSymbol, trademark] }; // "t"
+    key <AD06> { [NoSymbol, NoSymbol, yen] }; // "y"
+    key <AD10> { [NoSymbol, NoSymbol, acute, doubleacute] }; // "p"
+    key <AD11> { [NoSymbol, NoSymbol, bracketleft, braceleft ] }; // [
+    key <AD12> { [NoSymbol, NoSymbol, bracketright, braceright ] }; // ]
+
+// 3rd keyboard row
+    key <AC01> { [NoSymbol, NoSymbol, U0301, NoSymbol] }; // "a"
+    key <AC02> { [NoSymbol, NoSymbol, section]}; // "s"
+    key <AC03> { [NoSymbol, NoSymbol, degree, division] }; // "d"
+    key <AC04> { [NoSymbol, NoSymbol, sterling, NoSymbol] }; // "f"
+    key <AC07> { [NoSymbol, NoSymbol, doublelowquotemark, singlelowquotemark] }; // "j"
+    key <AC08> { [NoSymbol, NoSymbol, leftdoublequotemark, leftsinglequotemark] }; // "k"
+    key <AC09> { [NoSymbol, NoSymbol, rightdoublequotemark, rightsinglequotemark] }; // "l"
+    key <AC10> { [NoSymbol, NoSymbol, leftsinglequotemark, minutes] }; // ";"
+    key <AC11> { [NoSymbol, NoSymbol, rightsinglequotemark, seconds] }; // "'"
+
+// 4th keyboard row
+    key <AB02> { [NoSymbol, NoSymbol, multiply, U22C5] }; // "x"
+    key <AB03> { [NoSymbol, NoSymbol, copyright, cent] }; // "c"
+    key <AB08> { [NoSymbol, NoSymbol, guillemotleft, less] }; // ","
+    key <AB09> { [NoSymbol, NoSymbol, guillemotright, greater] }; // "."
+    key <AB10> { [NoSymbol, NoSymbol, ellipsis] }; // "/"
+};
diff --git a/xorg-server/xkbdata.src/symbols/ua b/xorg-server/xkbdata.src/symbols/ua
index 73439cafd..150ada562 100644
--- a/xorg-server/xkbdata.src/symbols/ua
+++ b/xorg-server/xkbdata.src/symbols/ua
@@ -7,11 +7,51 @@
 //
 // $XFree86: xc/programs/xkbcomp/symbols/ua,v 1.4 2003/05/15 11:29:47 pascal Exp $
 
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
+// Unicode - 3d level added with some Unicode symbols (typographic quotes, m-dash, n-dash etc), 
+// some often used cyrillics from other slavic languages and some ASCII symbols used often (slash, brackets...)
+partial default alphanumeric_keys
+xkb_symbols "unicode" {
+    include "ua(winkeys)"
+ 
     name[Group1]= "Ukraine";
 
+    key <TLDE> {    [           U2019, 	apostrophe,    U0301,   asciitilde     ]       };	// Apostrophe and Stress symbol
+    key <AE02> {    [               1,      exclam,  onesuperior               ]       };
+    key <AE02> {    [               2,    quotedbl,  twosuperior               ]       };
+    key <AE03> {    [               3,  numerosign,	   U00A7,    U20B4     ]       };	// Paragraph and Hryvnia sign
+    key <AE04> {    [               4,   semicolon,	  dollar,    EuroSign  ]       };
+    key <AE05> {    [               5,     percent,	  degree               ]       };
+    key <AE06> {    [               6,       colon,   less                             ]       };
+    key <AE07> {    [               7,    question,   greater                             ]       };
+    key <AE08> {    [               8,    asterisk, enfilledcircbullet         ]       };
+    key	<AE09> {    [		    9,	 parenleft,  bracketleft,    braceleft ]       };
+    key	<AE10> {    [		    0,	parenright, bracketright,    braceright]       };
+    key	<AE11> {    [	    	minus,	underscore,       emdash,    endash    ]       };
+    key	<AE12> {    [	    	equal,	      plus, 	notequal,    plusminus ]       };
+
+    key	<AD03> {    [      Cyrillic_u,	Cyrillic_U,  Byelorussian_shortu,  Byelorussian_SHORTU	]};
+    key	<AD04> {    [     Cyrillic_ka, Cyrillic_KA,	registered	       ]       };						// Registered tm
+    key	<AD05> {    [     Cyrillic_ie, Cyrillic_IE,     Cyrillic_io,     Cyrillic_IO	]	};
+    key	<AD12> {    [    Ukrainian_yi,Ukrainian_YI,	Cyrillic_hardsign,	Cyrillic_HARDSIGN	]	};
+    key	<AC02> {    [    Ukrainian_i,  Ukrainian_I, Cyrillic_yeru,   Cyrillic_YERU	]	};
+    key	<AC11> {    [    Ukrainian_ie,Ukrainian_IE,	Cyrillic_e,	Cyrillic_E	]	};
+
+    key	<BKSL> {    [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN, backslash,  bar	]	};
+
+    key	<AB03> {    [     Cyrillic_es,     Cyrillic_ES,	copyright              ]	};
+    key	<AB06> {    [     Cyrillic_te,     Cyrillic_TE,	trademark              ]	};
+    key	<AB08> {    [     Cyrillic_be,     Cyrillic_BE,	guillemotleft,	doublelowquotemark 	]	};
+    key	<AB09> {    [     Cyrillic_yu,     Cyrillic_YU,	guillemotright, leftdoublequotemark ]	};
+    key <AB10> {    [          period,           comma,	slash,          ellipsis        ]       };
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "legacy" {
+
+    name[Group1]= "Ukraine - Legacy";
+
     key	<TLDE> {	[      apostrophe,	asciitilde	]	};
     key	<AE01> {	[		1,	    exclam 	]	};
     key	<AE02> {	[		2,        quotedbl	]	};
@@ -69,7 +109,7 @@ xkb_symbols "basic" {
 
 partial alphanumeric_keys
 xkb_symbols "winkeys" {
-    include "ua(basic)"
+    include "ua(legacy)"
  
     name[Group1]= "Ukraine - Winkeys";
 
@@ -82,50 +122,9 @@ xkb_symbols "winkeys" {
     key <AB10> {        [          period,           comma      ]       };
 };
 
-
-// Unicode - 3d level added with some Unicode symbols (typographic quotes, m-dash, n-dash etc), 
-// some often used cyrillics from other slavic languages and some ASCII symbols used often (slash, brackets...)
-partial alphanumeric_keys
-xkb_symbols "unicode" {
-    include "ua(winkeys)"
- 
-    name[Group1]= "Ukraine - Unicode";
-
-    key <TLDE> {    [           U2019, 	apostrophe,    U0301,   asciitilde     ]       };	// Apostrophe and Stress symbol
-    key <AE02> {    [               1,      exclam,  onesuperior               ]       };
-    key <AE02> {    [               2,    quotedbl,  twosuperior               ]       };
-    key <AE03> {    [               3,  numerosign,	   U00A7,    U20B4     ]       };	// Paragraph and Hryvnia sign
-    key <AE04> {    [               4,   semicolon,	  dollar,    EuroSign  ]       };
-    key <AE05> {    [               5,     percent,	  degree               ]       };
-    key <AE06> {    [               6,       colon,   less                             ]       };
-    key <AE07> {    [               7,    question,   greater                             ]       };
-    key <AE08> {    [               8,    asterisk, enfilledcircbullet         ]       };
-    key	<AE09> {    [		    9,	 parenleft,  bracketleft,    braceleft ]       };
-    key	<AE10> {    [		    0,	parenright, bracketright,    braceright]       };
-    key	<AE11> {    [	    	minus,	underscore,       emdash,    endash    ]       };
-    key	<AE12> {    [	    	equal,	      plus, 	notequal,    plusminus ]       };
-
-    key	<AD03> {    [      Cyrillic_u,	Cyrillic_U,  Byelorussian_shortu,  Byelorussian_SHORTU	]};
-    key	<AD04> {    [     Cyrillic_ka, Cyrillic_KA,	registered	       ]       };						// Registered tm
-    key	<AD05> {    [     Cyrillic_ie, Cyrillic_IE,     Cyrillic_io,     Cyrillic_IO	]	};
-    key	<AD12> {    [    Ukrainian_yi,Ukrainian_YI,	Cyrillic_hardsign,	Cyrillic_HARDSIGN	]	};
-    key	<AC02> {    [    Ukrainian_i,  Ukrainian_I, Cyrillic_yeru,   Cyrillic_YERU	]	};
-    key	<AC11> {    [    Ukrainian_ie,Ukrainian_IE,	Cyrillic_e,	Cyrillic_E	]	};
-
-    key	<BKSL> {    [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN, backslash,  bar	]	};
-
-    key	<AB03> {    [     Cyrillic_es,     Cyrillic_ES,	copyright              ]	};
-    key	<AB06> {    [     Cyrillic_te,     Cyrillic_TE,	trademark              ]	};
-    key	<AB08> {    [     Cyrillic_be,     Cyrillic_BE,	guillemotleft,	doublelowquotemark 	]	};
-    key	<AB09> {    [     Cyrillic_yu,     Cyrillic_YU,	guillemotright, leftdoublequotemark ]	};
-    key <AB10> {    [          period,           comma,	slash,          ellipsis        ]       };
-
-    include "level3(ralt_switch)"
-};
-
 partial alphanumeric_keys
 xkb_symbols "typewriter" {
-    include "ua(basic)"
+    include "ua(legacy)"
 
     name[Group1]= "Ukraine - Typewriter";
 
@@ -154,7 +153,7 @@ xkb_symbols "typewriter" {
 
 partial alphanumeric_keys
 xkb_symbols "phonetic" {
-  include "ua(basic)"
+  include "ua(legacy)"
   
   name[Group1]= "Ukraine - Phonetic";
 
@@ -200,7 +199,7 @@ xkb_symbols "phonetic" {
 // Andrew Porokhnyak <aop@porokhnyak.org>
 partial alphanumeric_keys
 xkb_symbols "rstu" {
-    include "ua(basic)"
+    include "ua(legacy)"
 
     name[Group1]= "Ukraine - Standard RSTU";
 
@@ -257,7 +256,7 @@ key.type[group1]="ALPHABETIC";
 //Existing layout "phonetic" used as template.
 partial alphanumeric_keys
 xkb_symbols "homophonic" {
-  include "ua(basic)"
+  include "ua(legacy)"
   name[Group1]= "Ukraine - Homophonic";
 
   key <TLDE> {	 [          grave,	underscore	]	};
@@ -312,3 +311,24 @@ xkb_symbols "homophonic" {
   key <AB10> {   [ slash,             question            ]    };
 };
 
+// Crimean Tatar (Crimean Turkish) layouts.
+partial
+xkb_symbols "crh" {
+    include "tr(crh)"
+
+    name[Group1]="Ukraine - Crimean Tatar (Turkish Q)";
+};
+
+partial
+xkb_symbols "crh_f" {
+    include "tr(crh_f)"
+
+    name[Group1]="Ukraine - Crimean Tatar (Turkish F)";
+};
+
+partial
+xkb_symbols "crh_alt" {
+    include "tr(crh_alt)"
+
+    name[Group1]="Ukraine - Crimean Tatar (Turkish Alt-Q)";
+};
diff --git a/xorg-server/xkbdata.src/symbols/us b/xorg-server/xkbdata.src/symbols/us
index fb39c7200..20a1b57f4 100644
--- a/xorg-server/xkbdata.src/symbols/us
+++ b/xorg-server/xkbdata.src/symbols/us
@@ -62,7 +62,6 @@ xkb_symbols "basic" {
     key <AB10> {	[     slash,	question	]	};
 
     key <BKSL> {	[ backslash,         bar	]	};
-    key <CAPS> {	[ Caps_Lock	]	};
     // End alphanumeric section
 };
 
diff --git a/xorg-server/xkbdata.src/symbols/uz b/xorg-server/xkbdata.src/symbols/uz
index c651ff0d5..b37a6ca3f 100644
--- a/xorg-server/xkbdata.src/symbols/uz
+++ b/xorg-server/xkbdata.src/symbols/uz
@@ -99,3 +99,24 @@ xkb_symbols "latin" {
     key <AC11>  { [0x010002BB, quotedbl] };
 };
 
+// Crimean Tatar (Crimean Turkish) layouts.
+partial
+xkb_symbols "crh" {
+    include "tr(crh)"
+
+    name[Group1]="Uzbekistan - Crimean Tatar (Turkish Q)";
+};
+
+partial
+xkb_symbols "crh_f" {
+    include "tr(crh_f)"
+
+    name[Group1]="Uzbekistan - Crimean Tatar (Turkish F)";
+};
+
+partial
+xkb_symbols "crh_alt" {
+    include "tr(crh_alt)"
+
+    name[Group1]="Uzbekistan - Crimean Tatar (Turkish Alt-Q)";
+};
diff --git a/xorg-server/xkbdata.src/symbols/xfree68_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/xfree68_vndr/Makefile.in
index 57e8c8866..a12008f3e 100644
--- a/xorg-server/xkbdata.src/symbols/xfree68_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/symbols/xfree68_vndr/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -57,8 +53,6 @@ DATA = $(dist_symbols_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -71,10 +65,6 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
-CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
-CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
-CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -88,43 +78,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -144,15 +115,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
-USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XKBCOMP = @XKBCOMP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -160,6 +131,7 @@ am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build_alias = @build_alias@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -183,8 +155,12 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 xkb_base = @xkb_base@
 xkb_rules_symlink = @xkb_rules_symlink@
 symbolsdir = $(xkb_base)/symbols/xfree68_vndr
@@ -198,8 +174,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -223,10 +199,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
 install-dist_symbolsDATA: $(dist_symbols_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(symbolsdir)" || $(mkdir_p) "$(DESTDIR)$(symbolsdir)"
+	test -z "$(symbolsdir)" || $(MKDIR_P) "$(DESTDIR)$(symbolsdir)"
 	@list='$(dist_symbols_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -249,22 +224,21 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -280,7 +254,7 @@ check: check-am
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(symbolsdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -326,12 +300,20 @@ info-am:
 
 install-data-am: install-dist_symbolsDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -350,17 +332,21 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dist_symbolsDATA uninstall-info-am
+uninstall-am: uninstall-dist_symbolsDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-dist_symbolsDATA install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-dist_symbolsDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_symbolsDATA uninstall-info-am
+	uninstall-dist_symbolsDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.