diff --git a/debian/changelog b/debian/changelog
index 4d598ed..1d73501 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+emdebian-rootfs (2.0.6) unstable; urgency=low
+
+  * Clean up component support and ensure a sane default exists.
+
+ -- Neil Williams <codehelp@debian.org>  Thu, 04 Mar 2010 09:26:21 +0000
+
 emdebian-rootfs (2.0.5) unstable; urgency=low
 
   * Add shortcut conf files
diff --git a/em_multistrap b/em_multistrap
index 312628d..22c631b 100755
--- a/em_multistrap
+++ b/em_multistrap
@@ -117,7 +117,7 @@ foreach $section (sort keys %keys)
 		$packages{$section}=$keys{$section}{'packages'};
 		$suites{$section}=$keys{$section}{'suite'};
 		$components{$section}=$keys{$section}{'components'};
-		if (not exists $components{$section})
+		if (not defined $components{$section})
 		{
 			$components{$section}='main';
 		}
@@ -253,7 +253,7 @@ foreach my $aptsrc (@aptsources)
 			or die _g("Cannot open sources list"). $!;
 		$mirror = $sources{$aptsrc};
 		$suite = $suites{$aptsrc};
-		$component = $components{$aptsrc};
+		$component = (defined $components{$aptsrc}) ? $components{$aptsrc} : "main";
 		print SOURCES<<END;
 deb $mirror $suite $component
 deb-src $mirror $suite $component
@@ -298,9 +298,9 @@ die (sprintf (_g("apt update failed. Exit value: %d\n"), ($retval/256)))
 my $required = &get_required_debs;
 $str = join (' ', @$required);
 chomp($str);
-$str .= join (' ', values %packages) . " ";
+$str .= " " . join (' ', values %packages) . " ";
 chomp($str);
-$str .= join (' ', values %keyrings) . " "; 
+$str .= " " . join (' ', values %keyrings) . " "; 
 chomp($str);
 my %uniq=();
 my @s = split (' ', $str);