diff -Nru watershed-6build1/debian/changelog watershed-7/debian/changelog
--- watershed-6build1/debian/changelog	2012-10-08 22:27:40.000000000 +0000
+++ watershed-7/debian/changelog	2012-12-04 14:53:52.000000000 +0000
@@ -1,8 +1,8 @@
-watershed (6build1) quantal; urgency=low
+watershed (7) raring; urgency=low
 
-  * Rebuild for new armel compiler default of ARMv5t.
+  * Use correct compiler when cross-building.
 
- -- Colin Watson <cjwatson@ubuntu.com>  Mon, 08 Oct 2012 23:27:40 +0100
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 04 Dec 2012 14:53:46 +0000
 
 watershed (6) precise; urgency=low
 
diff -Nru watershed-6build1/debian/rules watershed-7/debian/rules
--- watershed-6build1/debian/rules	2011-12-01 10:27:35.000000000 +0000
+++ watershed-7/debian/rules	2012-12-04 14:50:14.000000000 +0000
@@ -1,7 +1,16 @@
 #!/usr/bin/make -f
 
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+	CROSS :=
+else
+	CROSS := CC=$(DEB_HOST_GNU_TYPE)-gcc LD=$(DEB_HOST_GNU_TYPE)-gcc
+endif
+
 override_dh_auto_build:
-	dh_auto_build -- Q=
+	dh_auto_build -- Q= $(CROSS)
 
 override_dh_auto_install:
 	$(MAKE) install-bin DESTDIR=$(CURDIR)/debian/tmp