diff -pruN 2.06-1/debian/changelog 2.06-1ubuntu1/debian/changelog
--- 2.06-1/debian/changelog	2007-07-05 00:42:19.000000000 +0100
+++ 2.06-1ubuntu1/debian/changelog	2009-08-05 22:17:39.000000000 +0100
@@ -1,3 +1,16 @@
+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
diff -pruN 2.06-1/debian/control 2.06-1ubuntu1/debian/control
--- 2.06-1/debian/control	2007-07-05 00:42:19.000000000 +0100
+++ 2.06-1ubuntu1/debian/control	2009-08-05 22:17:39.000000000 +0100
@@ -2,7 +2,8 @@ Source: pwgen
 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
diff -pruN 2.06-1/pwgen.c 2.06-1ubuntu1/pwgen.c
--- 2.06-1/pwgen.c	2007-07-05 00:42:19.000000000 +0100
+++ 2.06-1ubuntu1/pwgen.c	2009-08-05 22:17:39.000000000 +0100
@@ -138,7 +138,7 @@ int main(int argc, char **argv)
 			break;
 		case 's':
 			pwgen = pw_rand;
-			pwgen_flags = PW_DIGITS | PW_UPPERS;
+			pwgen_flags |= PW_DIGITS | PW_UPPERS;
 			break;
 		case 'C':
 			do_columns = 1;