diff -Nru checkpolicy-2.1.0/debian/changelog checkpolicy-2.1.0/debian/changelog
--- checkpolicy-2.1.0/debian/changelog	2012-02-05 06:12:34.000000000 +0000
+++ checkpolicy-2.1.0/debian/changelog	2012-01-22 04:21:52.000000000 +0000
@@ -1,3 +1,13 @@
+checkpolicy (2.1.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/rules,debian/patches/multiarch.patch
+    - add multiarch support to fix FTBFS (#652748)
+  * debian/source/format
+    - add it to support quilt
+
+ -- Hideki Yamane <henrich@debian.org>  Fri, 30 Dec 2011 10:52:06 +0900
+
 checkpolicy (2.1.0-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru checkpolicy-2.1.0/debian/patches/multiarch.patch checkpolicy-2.1.0/debian/patches/multiarch.patch
--- checkpolicy-2.1.0/debian/patches/multiarch.patch	1970-01-01 00:00:00.000000000 +0000
+++ checkpolicy-2.1.0/debian/patches/multiarch.patch	2012-01-22 04:21:52.000000000 +0000
@@ -0,0 +1,26 @@
+Index: checkpolicy-2.1.0/Makefile
+===================================================================
+--- checkpolicy-2.1.0.orig/Makefile	2011-12-30 10:52:31.000000000 +0900
++++ checkpolicy-2.1.0/Makefile	2011-12-30 10:56:31.558470187 +0900
+@@ -4,7 +4,7 @@
+ PREFIX ?= $(DESTDIR)/usr
+ BINDIR ?= $(PREFIX)/bin
+ MANDIR ?= $(PREFIX)/share/man
+-LIBDIR ?= $(PREFIX)/lib
++LIBDIR ?= $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
+ INCLUDEDIR ?= $(PREFIX)/include
+ TARGETS = checkpolicy checkmodule
+ 
+Index: checkpolicy-2.1.0/test/Makefile
+===================================================================
+--- checkpolicy-2.1.0.orig/test/Makefile	2011-12-30 10:59:04.366659283 +0900
++++ checkpolicy-2.1.0/test/Makefile	2011-12-30 11:00:12.686744558 +0900
+@@ -3,7 +3,7 @@
+ #
+ PREFIX ?= $(DESTDIR)/usr
+ BINDIR=$(PREFIX)/bin
+-LIBDIR=$(PREFIX)/lib
++LIBDIR=$(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
+ INCLUDEDIR ?= $(PREFIX)/include
+ 
+ CFLAGS ?= -g -Wall -O2 -pipe
diff -Nru checkpolicy-2.1.0/debian/patches/series checkpolicy-2.1.0/debian/patches/series
--- checkpolicy-2.1.0/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ checkpolicy-2.1.0/debian/patches/series	2012-01-22 04:21:52.000000000 +0000
@@ -0,0 +1 @@
+multiarch.patch
diff -Nru checkpolicy-2.1.0/debian/rules checkpolicy-2.1.0/debian/rules
--- checkpolicy-2.1.0/debian/rules	2012-02-05 06:12:34.000000000 +0000
+++ checkpolicy-2.1.0/debian/rules	2012-01-22 04:21:52.000000000 +0000
@@ -37,6 +37,8 @@
 $(error This is a linux only package. Aborting build.)
 endif
 
+DEB_HOST_MULTIARCH  ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 # Set variables with information extracted from control and changelog files
 include debian/common/pkgvars.mk
 
diff -Nru checkpolicy-2.1.0/debian/source/format checkpolicy-2.1.0/debian/source/format
--- checkpolicy-2.1.0/debian/source/format	1970-01-01 00:00:00.000000000 +0000
+++ checkpolicy-2.1.0/debian/source/format	2012-02-05 06:12:35.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)