diff --git a/debian/changelog b/debian/changelog
index 6dde490..7c7d661 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libgpod (0.8.2-6ubuntu1) quantal-proposed; urgency=low
+
+  * [1c86366] Make -cil packages non-arch-all (Closes: #689054, LP: #1070631)
+  * [409b51d] Add armhf to list of architectures
+
+ -- Chow Loong Jin <hyperair@debian.org>  Wed, 14 Nov 2012 13:48:47 +0800
+
 libgpod (0.8.2-6) unstable; urgency=low
 
   * [5c4dc2b] Tighten libgpod-common dependency.
diff --git a/debian/control b/debian/control
index 145766c..64d687f 100644
--- a/debian/control
+++ b/debian/control
@@ -25,10 +25,10 @@ Build-Depends: debhelper (>= 8.9~),
                gtk-doc-tools,
                docbook-xml,
                xsltproc,
-Build-Depends-Indep: cli-common-dev (>= 0.5.7),
-                     mono-devel (>= 2.4.3),
-                     libgtk2.0-cil-dev (>= 2.12),
-                     libglib2.0-cil-dev (>= 2.12)
+               cli-common-dev (>= 0.5.7) [amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc],
+               mono-devel (>= 2.4.3) [amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc],
+               libgtk2.0-cil-dev (>= 2.12) [amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc],
+               libglib2.0-cil-dev (>= 2.12) [amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc]
 Homepage: http://www.gtkpod.org/wiki/Libgpod
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-gtkpod/packages/libgpod.git
@@ -138,7 +138,7 @@ Description: Python bindings for libgpod
 
 Package: libgpod-cil
 Section: cli-mono
-Architecture: all
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc
 Depends: ${cli:Depends}, ${misc:Depends}
 Description: CLI bindings for libgpod
  libgpod is a library meant to abstract access to an iPod's content. It
@@ -151,8 +151,8 @@ Description: CLI bindings for libgpod
 
 Package: libgpod-cil-dev
 Section: libdevel
-Architecture: all
-Depends: libgpod-cil (= ${source:Version}), ${misc:Depends}
+Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x sparc
+Depends: libgpod-cil (= ${binary:Version}), ${misc:Depends}
 Description: CLI bindings for libgpod -- development files
  libgpod is a library meant to abstract access to an iPod's content. It
  provides an easy way to use API to retrieve the list of files and
diff --git a/debian/rules b/debian/rules
index fd81911..1cbf155 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,5 @@
 #!/usr/bin/make -f
 
-#-include /usr/share/cli-common/cli.make
-
-# copied from /usr/share/cli-common/cli.make
 export MONO_DISABLE_SHM = 1
 
 DH = dh $(1) --parallel --with=autoreconf --with=python2
@@ -13,19 +10,12 @@ export LDFLAGS=-Wl,-O1 -Wl,--as-needed
 PYVERS = $(shell pyversions -v -r ./debian/control)
 confflags += --without-hal --enable-udev
 
-# indep stuff
-binary: binary-arch binary-indep
-binary-arch:
-	_LIBGPOD_BUILD_=arch $(call DH, $@)
-binary-indep:
-	_LIBGPOD_BUILD_=indep $(call DH, $@) --with=cli
-
-
 # targets are appended to $(BASE) to get the build directory
-ifeq ($(_LIBGPOD_BUILD_),arch)
-targets = gtk nogtk $(foreach i, $(PYVERS), python$(i))
-else
-targets = mono doc
+targets = gtk nogtk $(foreach i, $(PYVERS), python$(i)) doc
+
+ifneq (,$(findstring -cil,$(shell dh_listpackages)))
+targets += mono
+DH += --with=cli
 endif
 
 BASE = build
@@ -169,4 +159,4 @@ override_dh_python2:
 %:
 	$(call DH, $@)
 
-.PHONY: clean build build-arch build-indep
+.PHONY: clean