diff --git a/tools/publish_cds b/tools/publish_cds
index a9969335..6c706080 100755
--- a/tools/publish_cds
+++ b/tools/publish_cds
@@ -2,6 +2,8 @@
     eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
         if 0; #$running_under_some_shell
 
+# $Id$
+
 # Copyright (c) 2002 Philip Hands <phil@hands.com>
 # See the README file for the license
 
@@ -21,8 +23,9 @@
 use strict;
 use MIME::Base64;
 use File::Copy;
+use Compress::Zlib ;
 
-my $to_dir = shift @ARGV || die "Usage: $0 <to_dir>\n" ;
+my $cd_version = shift @ARGV || die "Usage: $0 <cd_version> [<arch> ...]\n" ;
 my %conf;
 my %jigdosums;
 
@@ -38,10 +41,12 @@ sub jigsum_to_md5sum ($) {
 		     $str =~ /(.{1,60})/gs));
 }
 
+sub mkdirs ($);
+
 sub mkdirs ($) {
   my $path = shift;
 
-  return if (-d $path) ;
+  return 1 if (-d $path) ;
 
   if ($path =~ m|^(.*)/[^/]*$|) {
     mkdirs($1);
@@ -50,6 +55,13 @@ sub mkdirs ($) {
   mkdir($path);
 }
 
+sub md5sum_file($) {
+  open(FILE, $_) or die "Can't open '$_': $!";
+  binmode(FILE);
+  my ($retval) = Digest::MD5->new->addfile(*FILE)->hexdigest ;
+  close(FILE) ;
+  return($retval);
+}
 
 # Pick up settings from CONF.sh
 
@@ -65,22 +77,49 @@ close(SHELL) ;
 my $from_dir = $conf{'OUT'} ;
 my $mirror_dir = $conf{'MIRROR'} ;
 my $nonus_dir = $conf{'NONUS'} ;
+my $tdir = $conf{'TDIR'} ;
+my $publish_url = $conf{'PUBLISH_URL'} ;
+my $publish_path = $conf{'PUBLISH_PATH'} ;
 
-for my $arch (<$from_dir/*>) {
+my $to_dir = $publish_path . "/" . $cd_version . "/" ;
+my $fallback_url = $publish_url . "/$cd_version/snapshot/" ; 
+
+my @archs ;
+if ($#ARGV >= 0) {
+  foreach (@ARGV) {
+    push @archs, $from_dir . "/" . $_ ;
+  }
+} else {
+  @archs = <$from_dir/*> ;
+}
+
+for my $arch (@archs) {
   my $bad_images ;
 
   my $to_arch = $arch ;
   $to_arch =~ s|^$from_dir|$to_dir/jigdo| ;
   $to_arch =~ s%/src$%/source% ;
-  mkdirs($to_arch) || die ;
+  mkdirs($to_arch) || die "failed to create $to_arch" ;
 
   open(MD5OUT, ">$to_arch/MD5SUMS");
 
   for my $jigdo (<$arch/*.jigdo>) {
     my ($http, $filename, $size, $md5) ;
 
+    $jigdo =~ m|/([^-/]*)-([^-/]*)-([^-/]*)\.jigdo$| ;
+    my ($distname) = $1 ;
+    my ($archname) = $2 ;
+    my ($diskname) = $3 ;
+
     # find out the image name
     open (JIGDO, $jigdo) || die;
+    printf "Opening %s\n", $jigdo ;
+
+    my ($newjigdo) = $jigdo ;
+    $newjigdo =~ s|^.*/([^/]*)$|$to_arch/$1| ;
+    my $jigdo_gz = gzopen($newjigdo, "wb") ||
+      die "ERROR: failed to open $newjigdo ($!)";
+
     my $section = "" ;
     while(<JIGDO>) {
       chomp;
@@ -88,11 +127,14 @@ for my $arch (<$from_dir/*>) {
 	die "ERROR: don't know how to handle multi-image jigdo files"
 	  if ($section eq "Image" && $1 eq "Image") ;
 	$section = $1;
+        $jigdo_gz->gzwrite($_ . "\n") ;
 	next ;
       }
       if ($section eq "Image") {
 	if (/^Filename=(.*)$/) { $filename = $1 ; }
-	if (/^Template=(.*)$/) { $http = $1 ; }
+	if (/^Template=(.*)$/) {
+	  $_ = "Template=$publish_url/$cd_version/jigdo/$archname/$distname-$archname-$diskname.template" ;
+	}
       }
       elsif ($section eq "Parts") {
 	if (/^([^=]*)=(.*)$/) {
@@ -103,9 +145,54 @@ for my $arch (<$from_dir/*>) {
 	  } else {
 	    $jigdosums{$file} = $jigsum ;
 	  }
-	}
-      }   
+
+	  # and now we make the hardlink snapshot,
+	  # and check that all the md5's match
+
+	  my $frompath = $file ;
+	  my $tsubdir = "$distname-$archname/CD$diskname" ;
+	  $frompath =~ s|^Debian:|$tdir/$tsubdir/| ;
+	  $frompath =~ s|^Non-US:|$tdir/$tsubdir/| ;
+
+	  if (!-f $frompath) {
+	    print STDERR "WARNING: $frompath is not a file\n" ;
+	    # if it's missing, let's grab it from the mirror
+	    $frompath = $file ;
+	    $frompath =~ s|^Debian:|$mirror_dir/| ;
+	    $frompath =~ s|^Non-US:|$nonus_dir/| ;
+          }
+
+	  my $topath = $file ;
+	  $topath =~ s|^Debian:|$to_dir/snapshot/| ;
+	  $topath =~ s|^Non-US:|$to_dir/snapshot/| ;
+
+	  $topath =~ m|^(.*)/[^/]*$| ;
+	  mkdirs($1) ;
+	  if (-f $frompath) {
+	    if (!-f $topath) {
+	      link ($frompath, $topath) || 
+	        die "ERROR: linking $frompath to $topath";
+	    } else {
+	      use File::Compare;
+	      my ($f_dev,$f_ino) = lstat($frompath) ;
+	      my ($t_dev,$t_ino) = lstat($topath) ;
+	      if ((($f_dev != $t_dev) || ($f_ino != $t_ino)) &&
+		  compare($frompath,$topath) != 0) {
+		die "ERROR: $frompath != $topath" ;
+	      }
+	    }
+	  } else {
+	    print STDERR "ERROR: $frompath is not a file\n" ;
+	  }
+
+        }
+      }
+      $jigdo_gz->gzwrite($_ . "\n") ;
     }
+    $jigdo_gz->gzwrite(sprintf "\n[Servers]\nDebian=%s\nNon-US=%s\n",
+      			       $fallback_url, $fallback_url); 
+
+    $jigdo_gz->gzclose() ;
     close(JIGDO);
 
     # get the checksum & size from the template
@@ -132,34 +219,8 @@ for my $arch (<$from_dir/*>) {
 
     copy($template, $to_arch) ||
       die "ERROR copying $template to $to_arch ($!)" ;
-    copy($jigdo, $to_arch) ||
-      die "ERROR copying $jigdo to $to_arch ($!)" ;
   }
   close(MD5OUT);
   unlink ("$to_arch/MD5SUMS") if ($bad_images) ;
 
 }
-
-
-# and now we make the hardlink snapshot, and check that all the md5's match
-for my $file (sort(keys(%jigdosums))) {
-  my $frompath = $file ;
-  $frompath =~ s|^Debian:|$mirror_dir/| ;
-  $frompath =~ s|^Non-US:|$nonus_dir/| ;
-
-  my $topath = $file ;
-  $topath =~ s|^Debian:|$to_dir/snapshot/| ;
-  $topath =~ s|^Non-US:|$to_dir/snapshot/| ;
-
-  #    printf "%s  %s\n", jigsum_to_md5sum($jigdosums{$file}), $frompath ;
-  #printf "%s\n", $frompath ;
-  #printf " --> %s\n", $topath ;
-
-  $topath =~ m|^(.*)/[^/]*$| ;
-  mkdirs($1) ;
-  if (-f $frompath) {
-    link ($frompath, $topath) || die "ERROR: linking $frompath to $topath";
-  } else {
-    print STDERR "ERROR: $frompath is not a file\n" ;
-  }
-}