diff --git a/debian/changelog b/debian/changelog
index 1caf9b20..a1cafed8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,10 @@ debian-cd (3.0.3) UNRELEASED; urgency=high
   * In README, recommend aptitude also for command line usage.
   * Clean up: remove files for potato and woody releases.
 
+  [ Steve McIntyre ]
+  * Removed m68k from the list of arches in generate_di+k_list and
+    generate_di_list to reduce warnings.
+
  -- Frans Pop <fjp@debian.org>  Wed, 11 Apr 2007 01:30:06 +0200
 
 debian-cd (3.0.2) unstable; urgency=high
diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list
index b30366a0..3c200740 100755
--- a/tools/generate_di+k_list
+++ b/tools/generate_di+k_list
@@ -227,29 +227,5 @@ EOF
 cat >> debian-installer+kernel-$DI_CODENAME << EOF
 #endif
 
-#ifdef ARCH_m68k
-fileutils
-amiboot
-atari-bootstrap
-emile
-vmelilo
-linux-image-2.6-amiga
-linux-image-2.6-mac
-EOF
-
-# Get the latest kernels for 2.4 d-i subarchs
-# XXX once m68k gets kernel-image-2.4-<subarch> packages, use those
-# instead.
-for subarch in amiga atari bvme6000 mvme147 mvme16x q40; do
-  zcat $MIRROR/dists/$CODENAME/main/binary-m68k/Packages.gz | \
-    sed -n 's/Package: \(kernel-image-2.4.*\)$/\1/p' | \
-    grep -- "-$subarch$" | sort -n | tail -n 1 \
-		>> debian-installer+kernel-$DI_CODENAME
-done
-
-cat >> debian-installer+kernel-$DI_CODENAME << EOF
-
-#endif
-
 EOF
 
diff --git a/tools/generate_di_list b/tools/generate_di_list
index 63b803e3..0249b202 100755
--- a/tools/generate_di_list
+++ b/tools/generate_di_list
@@ -6,7 +6,7 @@ die "Missing \$MIRROR variable" unless $ENV{MIRROR};
 die "Missing \$DI_CODENAME variable" unless $ENV{DI_CODENAME};
 die "Missing \$BASEDIR variable" unless $ENV{BASEDIR};
 
-my @ARCHES=qw{alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel
+my @ARCHES=qw{alpha arm hppa hurd-i386 i386 ia64 mips mipsel
               powerpc s390 sparc amd64};
 my $DATE=`date`;
 chomp $DATE;