diff -Nru libxklavier-5.2.1/debian/changelog libxklavier-5.2.1/debian/changelog
--- libxklavier-5.2.1/debian/changelog	2012-02-22 02:14:19.000000000 +0000
+++ libxklavier-5.2.1/debian/changelog	2012-03-21 18:33:26.000000000 +0000
@@ -1,3 +1,11 @@
+libxklavier (5.2.1-1ubuntu1) precise; urgency=low
+
+  * debian/patches/revert-default-group-change.patch:
+    - Revert change in group handling that can cause the wrong layout to
+      be enabled by default when autologging in.  LP: #960096
+
+ -- Michael Terry <mterry@ubuntu.com>  Wed, 21 Mar 2012 14:32:39 -0400
+
 libxklavier (5.2.1-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru libxklavier-5.2.1/debian/control libxklavier-5.2.1/debian/control
--- libxklavier-5.2.1/debian/control	2012-02-22 02:17:16.000000000 +0000
+++ libxklavier-5.2.1/debian/control	2012-03-21 18:35:42.000000000 +0000
@@ -6,8 +6,9 @@
 Source: libxklavier
 Priority: optional
 Section: libs
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu@debian.org>, Frederic Peters <fpeters@debian.org>, Josselin Mouette <joss@debian.org>, Michael Biebl <biebl@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Frederic Peters <fpeters@debian.org>, Josselin Mouette <joss@debian.org>, Michael Biebl <biebl@debian.org>
 Build-Depends: cdbs,
                debhelper (>= 8),
                dh-autoreconf,
diff -Nru libxklavier-5.2.1/debian/control.in libxklavier-5.2.1/debian/control.in
--- libxklavier-5.2.1/debian/control.in	2012-02-21 20:03:15.000000000 +0000
+++ libxklavier-5.2.1/debian/control.in	2012-03-21 18:35:38.000000000 +0000
@@ -1,7 +1,8 @@
 Source: libxklavier
 Priority: optional
 Section: libs
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: cdbs,
                debhelper (>= 8),
diff -Nru libxklavier-5.2.1/debian/patches/revert-default-group-change.patch libxklavier-5.2.1/debian/patches/revert-default-group-change.patch
--- libxklavier-5.2.1/debian/patches/revert-default-group-change.patch	1970-01-01 00:00:00.000000000 +0000
+++ libxklavier-5.2.1/debian/patches/revert-default-group-change.patch	2012-03-21 18:10:15.000000000 +0000
@@ -0,0 +1,15 @@
+Index: libxklavier-5.2.1/libxklavier/xklavier_config_xkb.c
+===================================================================
+--- libxklavier-5.2.1.orig/libxklavier/xklavier_config_xkb.c	2012-01-13 19:51:30.000000000 -0500
++++ libxklavier-5.2.1/libxklavier/xklavier_config_xkb.c	2012-03-21 14:09:57.773226914 -0400
+@@ -403,10 +403,6 @@
+ 			/* Return to normal X error processing */
+ 			xkl_engine_priv(engine, criticalSection) = FALSE;
+ 
+-			if (activate)
+-				xkl_config_set_group_by_description(engine,
+-								    preactivation_group_description);
+-
+ 			xkl_debug(160,
+ 				  "Unlinking the temporary xkb file %s\n",
+ 				  xkb_fn);
diff -Nru libxklavier-5.2.1/debian/patches/series libxklavier-5.2.1/debian/patches/series
--- libxklavier-5.2.1/debian/patches/series	2012-02-22 01:05:03.000000000 +0000
+++ libxklavier-5.2.1/debian/patches/series	2012-03-21 17:58:18.000000000 +0000
@@ -1 +1,2 @@
 0001-Explicitly-exporting-only-the-symbols-that-are-reall.patch
+revert-default-group-change.patch