diff --git a/debian/changelog b/debian/changelog
index 62d1450..5d1d9f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+multistrap (2.1.11) experimental; urgency=low
+
+  * Fix examples in comments within device_table.txt to
+    use consistent tabs. (Closes: #611808)
+
+ -- Neil Williams <codehelp@debian.org>  Wed, 02 Feb 2011 17:23:03 +0000
+
 multistrap (2.1.10) experimental; urgency=low
 
   * Fix typo in sysvinit chroot.sh script.
diff --git a/device-table.pl b/device-table.pl
index ccde79a..703957c 100755
--- a/device-table.pl
+++ b/device-table.pl
@@ -47,24 +47,18 @@ while( @ARGV ) {
 	if (!/^-/) {
 		unshift(@ARGV,$_);
 		last;
-	}
-	elsif (/^(-\?|-h|--help|--version)$/) {
+	} elsif (/^(-\?|-h|--help|--version)$/) {
 	&usageversion();
 		exit( 0 );
-	}
-	elsif (/^(-f|--file)$/) {
+	} elsif (/^(-f|--file)$/) {
 		$file = shift(@ARGV);
-	}
-	elsif (/^(-d|--dir)$/) {
+	} elsif (/^(-d|--dir)$/) {
 		$dir = shift(@ARGV);
-	}
-	elsif (/^(-n|--dry-run)$/) {
+	} elsif (/^(-n|--dry-run)$/) {
 		$dry++;
-	}
-	elsif (/^(--no-fakeroot)$/) {
+	} elsif (/^(--no-fakeroot)$/) {
 		$fakeroot="";
-	}
-	else {
+	} else {
 		die "$progname: "._g("Unknown option")." $_.\n";
 	}
 }
@@ -73,7 +67,7 @@ $msg = sprintf (_g("Need a configuration file - use %s -f\n"), $progname);
 die ($msg)
 	if (not -f $file);
 printf (_g("%s %s using %s\n"), $progname, $ourversion, $file);
-open (TABLE, "<", $file) or die ("$file: $!\n");
+open (TABLE, "<", $file) or die ("$progname: $file: $!\n");
 @list=<TABLE>;
 close (TABLE);
 
@@ -108,8 +102,7 @@ foreach $line (@list) {
 		push @seq, "mkdir -m $cmd[2] -p .$cmd[0]";
 		next;
 	}
-	if ($cmd[9] =~ /-/)
-	{
+	if ($cmd[9] =~ /-/) {
 		push @seq, "mknod .$cmd[0] $cmd[1] $cmd[5] $cmd[6]";
 		push @seq, "chmod $cmd[2] .$cmd[0]";
 		push @seq, "chown $cmd[3]:$cmd[4] .$cmd[0]";
@@ -132,7 +125,7 @@ if (defined $dry) {
 
 sub our_version {
 	my $query = `dpkg-query -W -f='\${Version}' multistrap 2>/dev/null`;
-	(defined $query) ? return $query : return "0.0.9";
+	(defined $query) ? return $query : return "2.1.10";
 }
 
 sub usageversion {
diff --git a/examples/device_table.txt b/examples/device_table.txt
index 68b6bc6..e44b984 100644
--- a/examples/device_table.txt
+++ b/examples/device_table.txt
@@ -103,16 +103,16 @@
 #/dev/sdg	b	640	0	0	8	97	1	1	15
 #/dev/sdh	b	640	0	0	8	112	0	0	-
 #/dev/sdh	b	640	0	0	8	113	1	1	15
-#/dev/sg		c	640	0	0	21	0	0	1	15
+#/dev/sg	c	640	0	0	21	0	0	1	15
 #/dev/scd	b	640	0	0	11	0	0	1	15
-#/dev/st		c	640	0	0	9	0	0	1	8
+#/dev/st	c	640	0	0	9	0	0	1	8
 #/dev/nst	c	640	0	0	9	128	0	1	8
 #/dev/st	c	640	0	0	9	32	1	1	4
 #/dev/st	c	640	0	0	9	64	1	1	4
 #/dev/st	c	640	0	0	9	96	1	1	4
 
 # Floppy disk devices
-#/dev/fd		b	640	0	0	2	0	0	1	2
+#/dev/fd	b	640	0	0	2	0	0	1	2
 #/dev/fd0d360	b	640	0	0	2	4	0	0	-
 #/dev/fd1d360	b	640	0	0	2	5	0	0	-
 #/dev/fd0h1200	b	640	0	0	2	8	0	0	-
@@ -136,4 +136,3 @@
 #/dev/sbpcd	b	640	0	0	25	0	0	1	4
 #/dev/mcd	b	640	0	0	23	0	0	0	-
 #/dev/optcd	b	640	0	0	17	0	0	0	-
-