diff -Nru gnome-keyring-3.6.1/debian/changelog gnome-keyring-3.6.1/debian/changelog
--- gnome-keyring-3.6.1/debian/changelog	2012-10-19 12:46:17.000000000 +0200
+++ gnome-keyring-3.6.1/debian/changelog	2013-07-06 11:09:40.000000000 +0200
@@ -1,3 +1,11 @@
+gnome-keyring (3.6.1-0ubuntu1.1) quantal-proposed; urgency=low
+
+  * Backport the following changes from gnome-keyring in Raring:
+    - Move the PKCS#11 module into a separate package. (LP: #1094319)
+    - Convert gnome-keyring to multi-arch. (LP: #859600)
+
+ -- Graham Inggs <graham@nerve.org.za>  Sat, 06 Jul 2013 11:07:07 +0200
+
 gnome-keyring (3.6.1-0ubuntu1) quantal-proposed; urgency=low
 
   * New upstream stable release 3.6.1 (LP: #1068565)
diff -Nru gnome-keyring-3.6.1/debian/control.in gnome-keyring-3.6.1/debian/control.in
--- gnome-keyring-3.6.1/debian/control.in	2012-09-26 06:50:49.000000000 +0200
+++ gnome-keyring-3.6.1/debian/control.in	2013-07-06 11:10:53.000000000 +0200
@@ -31,11 +31,15 @@
 
 Package: gnome-keyring
 Architecture: any
+Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends},
+             multiarch-support
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          gcr (>= 3.4),
          dbus-x11,
-         libcap2-bin [linux-any]
+         libcap2-bin [linux-any],
+         libp11-kit-gnome-keyring
 Recommends: libpam-gnome-keyring
 Breaks: libgnome-keyring0 (<< 3.0),
         seahorse-plugins (<< 3.0)
@@ -48,9 +52,30 @@
  password, and there is also a session keyring which is never stored to
  disk, but forgotten when the session ends.
 
+Package: libp11-kit-gnome-keyring
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends},
+             multiarch-support
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Breaks: gnome-keyring (<< ${binary:Version})
+Replaces: gnome-keyring (<< ${binary:Version})
+Description: GNOME keyring module for the PKCS#11 module loading library
+ gnome-keyring is a daemon in the session, similar to ssh-agent,
+ and other applications can use it to store passwords and other
+ sensitive information.
+ .
+ This package contains a PKCS#11 module that will allow using the GNOME
+ keyring as a certificate database.
+
 Package: libpam-gnome-keyring
 Section: admin
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends},
+             multiarch-support
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libpam-runtime (>= 1.0.1-6)
diff -Nru gnome-keyring-3.6.1/debian/gnome-keyring.install gnome-keyring-3.6.1/debian/gnome-keyring.install
--- gnome-keyring-3.6.1/debian/gnome-keyring.install	2012-09-26 06:50:49.000000000 +0200
+++ gnome-keyring-3.6.1/debian/gnome-keyring.install	2013-07-06 11:07:03.000000000 +0200
@@ -4,6 +4,4 @@
 usr/share/glib-2.0/schemas
 usr/share/GConf/gsettings
 usr/lib/gnome-keyring/devel/*.so
-usr/lib/*/pkcs11/*.so
 etc/xdg/autostart
-etc/pkcs11
diff -Nru gnome-keyring-3.6.1/debian/libp11-kit-gnome-keyring.install gnome-keyring-3.6.1/debian/libp11-kit-gnome-keyring.install
--- gnome-keyring-3.6.1/debian/libp11-kit-gnome-keyring.install	1970-01-01 02:00:00.000000000 +0200
+++ gnome-keyring-3.6.1/debian/libp11-kit-gnome-keyring.install	2013-07-06 11:07:03.000000000 +0200
@@ -0,0 +1,2 @@
+etc/pkcs11
+usr/lib/*/pkcs11/*.so
diff -Nru gnome-keyring-3.6.1/debian/libpam-gnome-keyring.install gnome-keyring-3.6.1/debian/libpam-gnome-keyring.install
--- gnome-keyring-3.6.1/debian/libpam-gnome-keyring.install	2012-09-26 06:50:49.000000000 +0200
+++ gnome-keyring-3.6.1/debian/libpam-gnome-keyring.install	2013-07-06 11:07:03.000000000 +0200
@@ -1,2 +1,2 @@
-lib/security/*.so
+lib/*/security/*.so
 debian/pam-configs usr/share/
diff -Nru gnome-keyring-3.6.1/debian/rules gnome-keyring-3.6.1/debian/rules
--- gnome-keyring-3.6.1/debian/rules	2012-09-26 06:50:49.000000000 +0200
+++ gnome-keyring-3.6.1/debian/rules	2013-07-06 11:07:03.000000000 +0200
@@ -10,7 +10,7 @@
 
 DEB_MAKE_CHECK_TARGET := -k check || true
 
-DEB_CONFIGURE_EXTRA_FLAGS += --with-pam-dir=/lib/security \
+DEB_CONFIGURE_EXTRA_FLAGS += --with-pam-dir=/lib/$(DEB_HOST_MULTIARCH)/security \
                              --enable-gtk-doc \
                              --disable-update-mime