diff --git a/dcapi/debian/rules b/dcapi/debian/rules
index 1dc3bcd618..72dd79404d 100755
--- a/dcapi/debian/rules
+++ b/dcapi/debian/rules
@@ -8,8 +8,15 @@
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=4
 
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+	confflags += --build `echo $(DEB_BUILD_GNU_TYPE) | sed -e 's/i[345]86/i686/'`
+else
+	confflags += --build `echo $(DEB_BUILD_GNU_TYPE) | sed -e 's/i[345]86/i686/'` --host `echo $(DEB_HOST_GNU_TYPE) | sed -e 's/i[345]86/i686/'`
+endif
+
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS = -g
@@ -27,13 +34,15 @@ config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
 	# autoreconf
-	./configure --build=$(DEB_BUILD_GNU_TYPE) \
+	./configure $(confflags) \
 		--prefix=/usr \
 		--disable-maintainer-mode \
+		--disable-backend-clgr \
+		--disable-backend-local \
 		CFLAGS="$(CFLAGS)"
 
 configure: configure.ac cf/boinc.m4
-	autoreconf --install --symlink
+	autoreconf --install --symlink --force
 
 build-arch: config.status build-arch-stamp
 build-arch-stamp:
@@ -63,6 +72,8 @@ clean:
 
 	# Add here commands to clean up after the build process.
 	-$(MAKE) distclean
+
+	# Update config.(guess|sub)
 	-test -r /usr/share/misc/config.sub && \
 	  cp -pf /usr/share/misc/config.sub scripts/config.sub
 	-test -r /usr/share/misc/config.guess && \