diff --git a/debian/changelog b/debian/changelog
index 5380a57..fcfb8d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+multistrap (2.1.19) experimental; urgency=low
+
+  * Fix multiarch/unstable support for packages listings.
+
+ -- Neil Williams <codehelp@debian.org>  Sat, 21 Apr 2012 14:45:49 +0100
+
 multistrap (2.1.18) experimental; urgency=low
 
   * Reverse logic of ignorenativearch, thanks to 
diff --git a/multistrap b/multistrap
index 23a0c10..0fb6c4f 100755
--- a/multistrap
+++ b/multistrap
@@ -1138,8 +1138,8 @@ sub cascade {
 				if (defined $keys{$section}{'configscript'} and (not defined $configsh));
 			$tgzname = lc($keys{$section}{'tarballname'})
 				if (defined $keys{$section}{'tarballname'} and (not defined $tgzname));
-			chomp($tgzname);
-			undef $tgzname if ($tgzname eq '');
+			chomp($tgzname) if (defined $tgzname);
+			undef $tgzname if (defined $tgzname and $tgzname eq '');
 			undef $configsh if ((defined $configsh) and (not -x $configsh));
 			$setupsh = lc($keys{$section}{'setupscript'})
 				if (defined $keys{$section}{'setupscript'} and (not defined $setupsh));
@@ -1247,9 +1247,9 @@ sub cascade {
 				}
 			} else {
 				if (ref ($keys{$section}{'packages'}) eq 'ARRAY') {
-					$packages{$section}=join(' ', @{$keys{$section}{'packages'}}) if (not exists $packages{$section});
+					$packages{$section}=join(' ', @{$keys{$section}{'packages'}});
 				} else {
-					$packages{$section}=join(' ', $keys{$section}{'packages'}) if (exists $packages{$section});
+					$packages{$section}=join(' ', $keys{$section}{'packages'});
 				}
 			}
 			$suites{$section}=$keys{$section}{'suite'}