diff -Nru gcr-3.6.0/debian/changelog gcr-3.6.0/debian/changelog
--- gcr-3.6.0/debian/changelog	2012-09-27 00:33:42.000000000 +0200
+++ gcr-3.6.0/debian/changelog	2013-07-06 09:38:09.000000000 +0200
@@ -1,3 +1,9 @@
+gcr (3.6.0-0ubuntu1.1) quantal-proposed; urgency=low
+
+  * Backport multi-arch changes from gcr in Saucy (LP: #998715)
+
+ -- Graham Inggs <graham@nerve.org.za>  Sat, 06 Jul 2013 09:26:16 +0200
+
 gcr (3.6.0-0ubuntu1) quantal; urgency=low
 
   * New upstream stable release
diff -Nru gcr-3.6.0/debian/control.in gcr-3.6.0/debian/control.in
--- gcr-3.6.0/debian/control.in	2012-09-27 00:33:42.000000000 +0200
+++ gcr-3.6.0/debian/control.in	2013-07-06 09:29:35.000000000 +0200
@@ -73,6 +73,8 @@
          ${shlibs:Depends}
 Breaks: gnome-keyring (<< 3.4),
         seahorse (<< 3.4)
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Glib wrapper library for PKCS#11 - runtime
  GCK is a wrapper based on GLib implementing the PKCS#11 (Cryptoki)
  interface.
@@ -131,6 +133,8 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libgcr-3-common
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Library for Crypto UI related task - runtime
  GCR is a library for crypto UI and related tasks.
  .
@@ -143,6 +147,7 @@
 Depends: ${misc:Depends}
 Replaces: libgcr-3-0 (<< 3.2.2-1)
 Breaks: libgcr-3-0 (<< 3.2.2-1)
+Multi-Arch: foreign
 Description: Library for Crypto UI related task - common files
  GCR is a library for crypto UI and related tasks.
  .
diff -Nru gcr-3.6.0/debian/gir1.2-gck-1.install gcr-3.6.0/debian/gir1.2-gck-1.install
--- gcr-3.6.0/debian/gir1.2-gck-1.install	2012-09-27 00:33:42.000000000 +0200
+++ gcr-3.6.0/debian/gir1.2-gck-1.install	2013-07-06 09:30:43.000000000 +0200
@@ -1 +1 @@
-usr/lib/girepository-1.0/Gck-1.typelib
+usr/lib/*/girepository-1.0/Gck-1.typelib usr/lib/girepository-1.0/
diff -Nru gcr-3.6.0/debian/gir1.2-gcr-3.install gcr-3.6.0/debian/gir1.2-gcr-3.install
--- gcr-3.6.0/debian/gir1.2-gcr-3.install	2012-09-27 00:33:42.000000000 +0200
+++ gcr-3.6.0/debian/gir1.2-gcr-3.install	2013-07-06 09:33:19.000000000 +0200
@@ -1 +1 @@
-usr/lib/girepository-1.0/Gcr-3.typelib
+usr/lib/*/girepository-1.0/Gcr-3.typelib usr/lib/girepository-1.0/
diff -Nru gcr-3.6.0/debian/libgck-1-0.install gcr-3.6.0/debian/libgck-1-0.install
--- gcr-3.6.0/debian/libgck-1-0.install	2012-09-27 00:33:42.000000000 +0200
+++ gcr-3.6.0/debian/libgck-1-0.install	2013-07-06 09:31:26.000000000 +0200
@@ -1 +1 @@
-usr/lib/libgck-1.so.*
+usr/lib/*/libgck-1.so.*
diff -Nru gcr-3.6.0/debian/libgck-1-dev.install gcr-3.6.0/debian/libgck-1-dev.install
--- gcr-3.6.0/debian/libgck-1-dev.install	2012-09-27 00:33:42.000000000 +0200
+++ gcr-3.6.0/debian/libgck-1-dev.install	2013-07-06 09:31:49.000000000 +0200
@@ -1,4 +1,4 @@
 usr/include/gck-1
-usr/lib/libgck-1.so
-usr/lib/pkgconfig/gck-1.pc
+usr/lib/*/libgck-1.so
+usr/lib/*/pkgconfig/gck-1.pc
 usr/share/gir-1.0/Gck-1.gir
diff -Nru gcr-3.6.0/debian/libgcr-3-1.install gcr-3.6.0/debian/libgcr-3-1.install
--- gcr-3.6.0/debian/libgcr-3-1.install	2012-09-27 00:33:42.000000000 +0200
+++ gcr-3.6.0/debian/libgcr-3-1.install	2013-07-06 09:32:06.000000000 +0200
@@ -1,2 +1,2 @@
-usr/lib/libgcr-3.so.*
-usr/lib/libgcr-base-3.so.*
+usr/lib/*/libgcr-3.so.*
+usr/lib/*/libgcr-base-3.so.*
diff -Nru gcr-3.6.0/debian/libgcr-3-dev.install gcr-3.6.0/debian/libgcr-3-dev.install
--- gcr-3.6.0/debian/libgcr-3-dev.install	2012-09-27 00:33:42.000000000 +0200
+++ gcr-3.6.0/debian/libgcr-3-dev.install	2013-07-06 09:32:29.000000000 +0200
@@ -1,6 +1,6 @@
 usr/include/gcr-3
-usr/lib/libgcr-3.so
-usr/lib/libgcr-base-3.so
-usr/lib/pkgconfig/gcr-3.pc
-usr/lib/pkgconfig/gcr-base-3.pc
+usr/lib/*/libgcr-3.so
+usr/lib/*/libgcr-base-3.so
+usr/lib/*/pkgconfig/gcr-3.pc
+usr/lib/*/pkgconfig/gcr-base-3.pc
 usr/share/gir-1.0/Gcr-3.gir
diff -Nru gcr-3.6.0/debian/rules gcr-3.6.0/debian/rules
--- gcr-3.6.0/debian/rules	2012-09-27 00:33:42.000000000 +0200
+++ gcr-3.6.0/debian/rules	2013-07-06 09:33:44.000000000 +0200
@@ -10,7 +10,8 @@
 
 DEB_MAKE_CHECK_TARGET := -k check || true
 
-DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/gcr \
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+                             --libexecdir=/usr/lib/gcr \
                              --enable-gtk-doc \
                              --enable-introspection \
                              --disable-update-mime