diff --git a/tools/add_packages b/tools/add_packages
index 5d8a5fc3..2396580c 100755
--- a/tools/add_packages
+++ b/tools/add_packages
@@ -20,8 +20,8 @@ my $old_split = $/;
 sub msg_ap {
     my $level = shift;
     if (!$log_opened) {
-	open(AP_LOG, ">> $tdir/$codename/log.add_packages")
-	    || die "Can't write in $tdir/log.add_packages!\n";
+        open(AP_LOG, ">> $tdir/$codename/log.add_packages")
+            || die "Can't write in $tdir/log.add_packages!\n";
     }
     print AP_LOG @_;
 }
@@ -41,18 +41,18 @@ sub Packages_dir {
     my ($pdir, $dist);
 
     if ($file =~ /\/main\//) {
-	$dist = "main";
+        $dist = "main";
     } elsif ($file =~ /\/contrib\//) {
-	$dist = "contrib";
+        $dist = "contrib";
     } elsif ($file =~ /\/non-free\//) {
-	$dist = "non-free";
+        $dist = "non-free";
     } elsif ($file =~ /\/local\//) {
-	$dist = "local";
+        $dist = "local";
     }	
 
     $pdir = "$dir/dists/$codename/$dist";
     if ($section eq "debian-installer") {
-	$pdir = "$dir/dists/$codename/$dist/debian-installer";
+        $pdir = "$dir/dists/$codename/$dist/debian-installer";
     }
     return $pdir;
 }
@@ -72,30 +72,30 @@ sub add_Packages_entry {
     m/^Section: (\S+)/m and $section = $1;
 
     if ($arch eq "source") {
-	m/^Directory: (\S+)/mi and $file = $1;
-	$pdir = Packages_dir($dir, $file, $section) . "/source";
-	$pkgfile = "$pdir/Sources";
+        m/^Directory: (\S+)/mi and $file = $1;
+        $pdir = Packages_dir($dir, $file, $section) . "/source";
+        $pkgfile = "$pdir/Sources";
     } else {
-	m/^Filename: (\S+)/mi and $file = $1;
-	$pdir = Packages_dir($dir, $file, $section) . "/binary-$arch";
-	$pkgfile = "$pdir/Packages";
+        m/^Filename: (\S+)/mi and $file = $1;
+        $pdir = Packages_dir($dir, $file, $section) . "/binary-$arch";
+        $pkgfile = "$pdir/Packages";
     }
 
     msg_ap(0, "  Adding $p to $pkgfile(.gz)\n");
     
     if (! -d $pdir) {
-	system("mkdir -p $pdir");
-	$blocks_added++;
+        system("mkdir -p $pdir");
+        $blocks_added++;
     }	
 
     if (-e $pkgfile) {
-	$st1 = stat("$pkgfile");
-	$old_blocks = size_in_blocks($st1->size);
+        $st1 = stat("$pkgfile");
+        $old_blocks = size_in_blocks($st1->size);
     }
 
     if (-e "$pkgfile.gz") {
-	$st1 = stat("$pkgfile.gz");
-	$old_blocks += size_in_blocks($st1->size);
+        $st1 = stat("$pkgfile.gz");
+        $old_blocks += size_in_blocks($st1->size);
     }
 
     open(PFILE, ">>$pkgfile");
@@ -131,20 +131,20 @@ sub add_md5_entry {
     m/^Package: (\S+)/mi and $p = $1;
 
     if (-e $md5file) {
-	$st = stat("$md5file");
-	$old_blocks = size_in_blocks($st->size);
+        $st = stat("$md5file");
+        $old_blocks = size_in_blocks($st->size);
     }
 
     open(MD5FILE, ">>$md5file");
 
     if ($arch eq "source") {
-	m/^Directory: (\S+)/mi and $pdir = $1;
-	m/^ (\S+) (\S+) ((\S+).*dsc)/m and print MD5FILE "$1  ./$pdir/$3\n";
-	m/^ (\S+) (\S+) ((\S+).*tar.gz)/m and print MD5FILE "$1  ./$pdir/$3\n";
-	m/^ (\S+) (\S+) ((\S+).*diff.gz)/m and print MD5FILE "$1  ./$pdir/$3\n";
+        m/^Directory: (\S+)/mi and $pdir = $1;
+        m/^ (\S+) (\S+) ((\S+).*dsc)/m and print MD5FILE "$1  ./$pdir/$3\n";
+        m/^ (\S+) (\S+) ((\S+).*tar.gz)/m and print MD5FILE "$1  ./$pdir/$3\n";
+        m/^ (\S+) (\S+) ((\S+).*diff.gz)/m and print MD5FILE "$1  ./$pdir/$3\n";
     } else {
-	m/^Filename: (\S+)/m and $file = $1;
-	m/^MD5sum: (\S+)/m and print MD5FILE "$1  ./$file\n";
+        m/^Filename: (\S+)/m and $file = $1;
+        m/^MD5sum: (\S+)/m and print MD5FILE "$1  ./$file\n";
     }
 
     close(MD5FILE);
@@ -172,23 +172,23 @@ sub remove_Packages_entry {
     m/^Section: (\S+)/m and $section = $1;
 
     if ($arch eq "source") {
-	m/^Directory: (\S+)/mi and $file = $1;
-	$pdir = Packages_dir($dir, $file, $section) . "/source";
-	$pkgfile = "$pdir/Sources";
+        m/^Directory: (\S+)/mi and $file = $1;
+        $pdir = Packages_dir($dir, $file, $section) . "/source";
+        $pkgfile = "$pdir/Sources";
     } else {
-	m/^Filename: (\S+)/mi and $file = $1;
-	$pdir = Packages_dir($dir, $file, $section) . "/binary-$arch";
-	$pkgfile = "$pdir/Packages";
+        m/^Filename: (\S+)/mi and $file = $1;
+        $pdir = Packages_dir($dir, $file, $section) . "/binary-$arch";
+        $pkgfile = "$pdir/Packages";
     }
 
     if (-e $pkgfile) {
-	$st1 = stat("$pkgfile");
-	$old_blocks += size_in_blocks($st1->size);
+        $st1 = stat("$pkgfile");
+        $old_blocks += size_in_blocks($st1->size);
     }
 
     if (-e "$pkgfile.gz") {
-	$st2 = stat("$pkgfile.gz");
-	$old_blocks += size_in_blocks($st2->size);
+        $st2 = stat("$pkgfile.gz");
+        $old_blocks += size_in_blocks($st2->size);
     }
 
     $tmp_pkgfile = "$pkgfile" . ".rollback";
@@ -201,10 +201,10 @@ sub remove_Packages_entry {
     $gz = gzopen("$pkgfile.gz", "wb9");
 
     while (defined($match = <IFILE>)) {
-	if (! ($match =~ /^Package: \Q$p\E$/m)) {
-	    print OFILE $match;
-	    $gz->gzwrite($match) or die "Failed to write $pkgfile.gz: $gzerrno\n";
-	}
+        if (! ($match =~ /^Package: \Q$p\E$/m)) {
+            print OFILE $match;
+            $gz->gzwrite($match) or die "Failed to write $pkgfile.gz: $gzerrno\n";
+        }
     }
 
     $gz->gzclose();
@@ -239,32 +239,32 @@ sub remove_md5_entry {
 
     m/^Package: (\S+)/mi and $p = $1;
     if ($arch eq "source") {
-	m/^Directory: (\S+)/mi and $pdir = $1;
-	m/^ (\S+) (\S+) ((\S+).*dsc)/m and push(@fileslist, "$1  ./$pdir/$3");
-	m/^ (\S+) (\S+) ((\S+).*diff.gz)/m and push(@fileslist, "$1  ./$pdir/$3");
-	m/^ (\S+) (\S+) ((\S+).*tar.gz)/m and push(@fileslist, "$1  ./$pdir/$3");
+        m/^Directory: (\S+)/mi and $pdir = $1;
+        m/^ (\S+) (\S+) ((\S+).*dsc)/m and push(@fileslist, "$1  ./$pdir/$3");
+        m/^ (\S+) (\S+) ((\S+).*diff.gz)/m and push(@fileslist, "$1  ./$pdir/$3");
+        m/^ (\S+) (\S+) ((\S+).*tar.gz)/m and push(@fileslist, "$1  ./$pdir/$3");
     } else {
-	m/^Filename: (\S+)/m and $file = $1;
-	m/^MD5Sum: (\S+)/mi and push(@fileslist, "$1  ./$file");
+        m/^Filename: (\S+)/m and $file = $1;
+        m/^MD5Sum: (\S+)/mi and push(@fileslist, "$1  ./$file");
     }
 
     if (-e $md5file) {
-	$st = stat("$md5file");
-	$old_blocks = size_in_blocks($st->size);
+        $st = stat("$md5file");
+        $old_blocks = size_in_blocks($st->size);
     }
 
     open(IFILE, "<$md5file");
     open(OFILE, ">>$tmp_md5file");
     while (defined($match = <IFILE>)) {
-	$present = 0;
-	foreach my $entry (@fileslist) {
-	    if (($match =~ /\Q$entry\E$/m)) {
-		$present++;
-	    }
-	}
-	if (!$present) {
-	    print OFILE $match;
-	}
+        $present = 0;
+        foreach my $entry (@fileslist) {
+            if (($match =~ /\Q$entry\E$/m)) {
+                $present++;
+            }
+        }
+        if (!$present) {
+            print OFILE $match;
+        }
     }
     close(IFILE);
     close(OFILE);
@@ -289,27 +289,24 @@ sub get_file_blocks {
 
 sub add_packages {
     my ($p, @files, $d, $realfile, $source, $section, $name, $pkgfile, $pdir);
-    my ($pkgname, $arch, $dir, $pkg);
+    my $dir;
 
     my $total_blocks = 0;
     my $rollback = 0;
     my $option = shift;	
     if ($option =~ /--rollback/) {
-	$rollback = 1;
-	$dir = shift;
+        $rollback = 1;
+        $dir = shift;
     } else {	
-	$dir = $option;
+        $dir = $option;
     }
 
     if (! -d $dir) { 
-	die "add_packages: $dir is not a directory ..."; 
+        die "add_packages: $dir is not a directory ..."; 
     }
 
-    $pkg = shift;
-    $pkgname = $pkg;
-    $pkgname =~ s/^.*://;
-    $arch = $pkg;
-    $arch =~ s/:.*$//g;
+    my $pkg = shift;
+    my ($arch, $pkgname) = split /:/, $pkg;
 
     msg_ap(0, "Looking at $pkg: arch $arch, package $pkgname, rollback $rollback\n");
     
@@ -317,68 +314,68 @@ sub add_packages {
 
     $ENV{'ARCH'} = $arch;
     if ($arch eq "source") {
-	open (LIST, "$basedir/tools/apt-selection cache showsrc $pkgname |")
-	    || die "Can't fork : $!\n";
+        open (LIST, "$basedir/tools/apt-selection cache showsrc $pkgname |")
+            || die "Can't fork : $!\n";
     } else {
-	open (LIST, "$basedir/tools/apt-selection cache show $pkgname |")
-	    || die "Can't fork : $!\n";
+        open (LIST, "$basedir/tools/apt-selection cache show $pkgname |")
+            || die "Can't fork : $!\n";
     }
 
     while (defined($_ = <LIST>)) {
-	undef @files;
+        undef @files;
 
-	m/^Package: (\S+)/m and $p = $1;
-	m/^Section: (\S+)/m and $section = $1;
+        m/^Package: (\S+)/m and $p = $1;
+        m/^Section: (\S+)/m and $section = $1;
 
-	$source = $mirror;
-	if ($arch eq "source") {
-	    m/^Directory: (\S+)/m and $pdir = $1;
-	    $source=$localdebs if $pdir=~m:local/:;
-	    $source=$security if $pdir=~m:updates/:;
-	    m/^ (\S+) (\S+) ((\S+).*dsc)/m and push(@files, "$pdir/$3");
-	    m/^ (\S+) (\S+) ((\S+).*diff.gz)/m and push(@files, "$pdir/$3");
-	    m/^ (\S+) (\S+) ((\S+).*tar.gz)/m and push(@files, "$pdir/$3");
-	} else {
-	    m/^Filename: (\S+)/mi and push(@files, $1);
-	    $source=$localdebs if $1=~m:local/:;
-	    $source=$security if $1=~m:updates/:;
-	}
+        $source = $mirror;
+        if ($arch eq "source") {
+            m/^Directory: (\S+)/m and $pdir = $1;
+            $source=$localdebs if $pdir=~m:local/:;
+            $source=$security if $pdir=~m:updates/:;
+            m/^ (\S+) (\S+) ((\S+).*dsc)/m and push(@files, "$pdir/$3");
+            m/^ (\S+) (\S+) ((\S+).*diff.gz)/m and push(@files, "$pdir/$3");
+            m/^ (\S+) (\S+) ((\S+).*tar.gz)/m and push(@files, "$pdir/$3");
+        } else {
+            m/^Filename: (\S+)/mi and push(@files, $1);
+            $source=$localdebs if $1=~m:local/:;
+            $source=$security if $1=~m:updates/:;
+        }
 
-	if ($rollback) {
-	    # Remove the Packages entry/entries for the specified package
-	    $total_blocks -= remove_Packages_entry($dir, $arch, $_);
-	    $total_blocks -= remove_md5_entry($dir, $arch, $_);
+        if ($rollback) {
+            # Remove the Packages entry/entries for the specified package
+            $total_blocks -= remove_Packages_entry($dir, $arch, $_);
+            $total_blocks -= remove_md5_entry($dir, $arch, $_);
 
-	    foreach my $file (@files) {
-		# Count how big the file is we're removing, for checking if the disc is full
-		$realfile = real_file ("$source/$file");
-		$total_blocks -= get_file_blocks($realfile);
+            foreach my $file (@files) {
+                # Count how big the file is we're removing, for checking if the disc is full
+                $realfile = real_file ("$source/$file");
+                $total_blocks -= get_file_blocks($realfile);
 
-		# Remove the link
-		unlink ("$dir/$file") or die "Failed to remove $dir/$file\n";
-		msg_ap(0, "  Rollback: removing $dir/$file\n");
-	    }
-	} else {
-	    $total_blocks += add_Packages_entry($dir, $arch, $_);
-	    $total_blocks += add_md5_entry($dir, $arch, $_);
+                # Remove the link
+                unlink ("$dir/$file") or die "Failed to remove $dir/$file\n";
+                msg_ap(0, "  Rollback: removing $dir/$file\n");
+            }
+        } else {
+            $total_blocks += add_Packages_entry($dir, $arch, $_);
+            $total_blocks += add_md5_entry($dir, $arch, $_);
 
-	    foreach my $file (@files) {
-		# And put the file in the CD tree (with a (hard) link)
-		$realfile = real_file ("$source/$file");
+            foreach my $file (@files) {
+                # And put the file in the CD tree (with a (hard) link)
+                $realfile = real_file ("$source/$file");
 
-		if (! -e "$dir/$file") {
-		    # Count how big the file is, for checking if the disc
-		    # is full. ONLY do this if the file is not already
-		    # linked in - consider binary-all packages on a
-		    # multi-arch disc
-		    $total_blocks += get_file_blocks($realfile);
-		    $total_blocks += good_link ($realfile, "$dir/$file");
-		    msg_ap(0, "  Linked $dir/$file\n");
-		} else {
-		    msg_ap(0, "  $dir/$file already linked in\n");
-		}
-	    }
-	}
+                if (! -e "$dir/$file") {
+                    # Count how big the file is, for checking if the disc
+                    # is full. ONLY do this if the file is not already
+                    # linked in - consider binary-all packages on a
+                    # multi-arch disc
+                    $total_blocks += get_file_blocks($realfile);
+                    $total_blocks += good_link ($realfile, "$dir/$file");
+                    msg_ap(0, "  Linked $dir/$file\n");
+                } else {
+                    msg_ap(0, "  $dir/$file already linked in\n");
+                }
+            }
+        }
     }
     close LIST or die "Something went wrong with apt-cache : $@ ($!)\n";
     msg_ap(0, "  size $total_blocks\n");
@@ -386,6 +383,4 @@ sub add_packages {
     return $total_blocks;
 }
 
-
-
 1;