--- pwgen-2.06.orig/pwgen.c
+++ pwgen-2.06/pwgen.c
@@ -138,7 +138,7 @@
 			break;
 		case 's':
 			pwgen = pw_rand;
-			pwgen_flags = PW_DIGITS | PW_UPPERS;
+			pwgen_flags |= PW_DIGITS | PW_UPPERS;
 			break;
 		case 'C':
 			do_columns = 1;
--- pwgen-2.06.orig/debian/changelog
+++ pwgen-2.06/debian/changelog
@@ -1,3 +1,36 @@
+pwgen (2.06-1ubuntu4) raring; urgency=low
+
+  * Use correct compiler when cross-building.
+  * Mark pwgen Multi-Arch: foreign (closes: #693964).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 04 Dec 2012 16:09:42 +0000
+
+pwgen (2.06-1ubuntu3) quantal; urgency=low
+
+  * Rebuild for new armel compiler default of ARMv5t.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 08 Oct 2012 16:52:52 +0100
+
+pwgen (2.06-1ubuntu2) lucid; urgency=low
+
+  * rebuild rest of main for armel armv7/thumb2 optimization;
+    UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2
+
+ -- Alexander Sack <asac@ubuntu.com>  Sun, 07 Mar 2010 01:02:06 +0100
+
+pwgen (2.06-1ubuntu1) karmic; urgency=low
+
+  * Fix pwgen -s so it works after other options (Closes: #436912,
+    LP: #297470)
+
+ -- Brian Murray <brian@ubuntu.com>  Wed, 05 Aug 2009 01:07:13 -0700
+
+pwgen (2.06-1build1) karmic; urgency=low
+
+  * No-change rebuild to gain FORTIFY defaults.
+
+ -- Kees Cook <kees@ubuntu.com>  Mon, 11 May 2009 12:07:50 -0700
+
 pwgen (2.06-1) unstable; urgency=low
 
   * New upstream version
--- pwgen-2.06.orig/debian/rules
+++ pwgen-2.06/debian/rules
@@ -4,11 +4,20 @@
 
 package=pwgen
 
+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
+endif
+
 build: build-stamp
 build-stamp:
 	dh_testdir
 	./configure --prefix=/usr --mandir=/usr/share/man
-	$(MAKE) CFLAGS="-O2 -g -Wall"
+	$(MAKE) CFLAGS="-O2 -g -Wall" $(CROSS)
 	touch build-stamp
 
 clean:
--- pwgen-2.06.orig/debian/control
+++ pwgen-2.06/debian/control
@@ -2,11 +2,13 @@
 Section: admin
 Priority: optional
 Build-Depends: debhelper (>= 4)
-Maintainer: Theodore Y. Ts'o <tytso@mit.edu>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Theodore Y. Ts'o <tytso@mit.edu>
 Standards-Version: 3.7.2.2
 
 Package: pwgen
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}
 Description: Automatic Password generation
  pwgen generates random, meaningless but pronounceable passwords.