diff -Nru gnome-keyring-3.6.2/debian/changelog gnome-keyring-3.6.2/debian/changelog
--- gnome-keyring-3.6.2/debian/changelog	2012-11-12 04:57:52.000000000 -0500
+++ gnome-keyring-3.6.2/debian/changelog	2013-01-07 15:03:42.000000000 -0500
@@ -1,3 +1,15 @@
+gnome-keyring (3.6.2-0ubuntu2) raring; urgency=low
+
+  * debian/control:
+    - Move the PKCS#11 module into a separate package. (LP: #1094319)
+    - Convert to use multi-arch. (LP: #859600)
+  * debian/gnome-keyring.install, debian/libp11-kit-gnome-keyring.*:
+    - The pkcs11 module needs to be a separate package.
+  * debian/libpam-gnome-keyring.install, debian/rules:
+    - Use the multi-arch directory for the PAM module.
+
+ -- Rodney Dawes <rodney.dawes@ubuntu.com>  Mon, 07 Jan 2013 15:03:31 -0500
+
 gnome-keyring (3.6.2-0ubuntu1) raring; urgency=low
 
   * New upstream version
diff -Nru gnome-keyring-3.6.2/debian/control gnome-keyring-3.6.2/debian/control
--- gnome-keyring-3.6.2/debian/control	2012-11-12 05:21:14.000000000 -0500
+++ gnome-keyring-3.6.2/debian/control	2013-01-07 15:14:08.000000000 -0500
@@ -35,12 +35,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]
-Recommends: libpam-gnome-keyring
+Recommends: libpam-gnome-keyring, libp11-kit-gnome-keyring
 Breaks: libgnome-keyring0 (<< 3.0),
         seahorse-plugins (<< 3.0)
 Description: GNOME keyring services (daemon and tools)
@@ -52,9 +55,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 (<< 3.6.2-0ubuntu2~)
+Replaces: gnome-keyring (<< 3.6.2-0ubuntu2~)
+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.2/debian/control.in gnome-keyring-3.6.2/debian/control.in
--- gnome-keyring-3.6.2/debian/control.in	2012-11-12 04:57:16.000000000 -0500
+++ gnome-keyring-3.6.2/debian/control.in	2013-01-07 15:13:19.000000000 -0500
@@ -31,12 +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]
-Recommends: libpam-gnome-keyring
+Recommends: libpam-gnome-keyring, libp11-kit-gnome-keyring
 Breaks: libgnome-keyring0 (<< 3.0),
         seahorse-plugins (<< 3.0)
 Description: GNOME keyring services (daemon and tools)
@@ -48,9 +51,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 (<< 3.6.2-0ubuntu2~)
+Replaces: gnome-keyring (<< 3.6.2-0ubuntu2~)
+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.2/debian/gnome-keyring.install gnome-keyring-3.6.2/debian/gnome-keyring.install
--- gnome-keyring-3.6.2/debian/gnome-keyring.install	2012-11-12 04:57:16.000000000 -0500
+++ gnome-keyring-3.6.2/debian/gnome-keyring.install	2013-01-07 15:12:15.000000000 -0500
@@ -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.2/debian/libp11-kit-gnome-keyring.install gnome-keyring-3.6.2/debian/libp11-kit-gnome-keyring.install
--- gnome-keyring-3.6.2/debian/libp11-kit-gnome-keyring.install	1969-12-31 19:00:00.000000000 -0500
+++ gnome-keyring-3.6.2/debian/libp11-kit-gnome-keyring.install	2013-01-07 15:12:26.000000000 -0500
@@ -0,0 +1,2 @@
+etc/pkcs11
+usr/lib/*/pkcs11/*.so
diff -Nru gnome-keyring-3.6.2/debian/libpam-gnome-keyring.install gnome-keyring-3.6.2/debian/libpam-gnome-keyring.install
--- gnome-keyring-3.6.2/debian/libpam-gnome-keyring.install	2012-11-12 04:57:16.000000000 -0500
+++ gnome-keyring-3.6.2/debian/libpam-gnome-keyring.install	2012-12-30 14:13:15.000000000 -0500
@@ -1,2 +1,2 @@
-lib/security/*.so
+lib/*/security/*.so
 debian/pam-configs usr/share/
diff -Nru gnome-keyring-3.6.2/debian/rules gnome-keyring-3.6.2/debian/rules
--- gnome-keyring-3.6.2/debian/rules	2012-11-12 04:57:16.000000000 -0500
+++ gnome-keyring-3.6.2/debian/rules	2012-12-30 14:12:15.000000000 -0500
@@ -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