diff --git a/debian/changelog b/debian/changelog
index 544daa4c..d8ba79e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -158,6 +158,9 @@ debian-cd (3.0.0) UNRELEASED; urgency=low
     fork/exec all the time. Re-arranged tools/add_packages to make
     this work.
   * Improved logging in add_packages.
+  * When we've finished making a CD tree in make_disc_trees.pl,
+    re-compress the gzipped Sources and Packages. Workaround for bug
+    #402482 in busybox gunzip code.
 
  -- Frans Pop <fjp@debian.org>  Thu,  7 Dec 2006 02:00:04 +0100
 
diff --git a/tools/make_disc_trees.pl b/tools/make_disc_trees.pl
index 81b2a2ac..e90dab29 100755
--- a/tools/make_disc_trees.pl
+++ b/tools/make_disc_trees.pl
@@ -169,6 +169,13 @@ sub md5_files_for_release {
 	my ($md5, $size, $filename);
 
 	$filename = $File::Find::name;
+
+	# Recompress the Packages and Sources files; workaround for bug
+	# #402482
+	if ($filename =~ m/\/.*\/(Packages|Sources)$/o) {
+		system("gzip -9c < $_ >$_.gz");
+	}
+
 	if ($filename =~ m/\/.*\/(Packages|Sources|Release)/o) {
 		$filename =~ s/^\.\///g;
 		($md5, $size) = md5_file($_);