diff --git a/build/pkg-lists/access/common b/build/pkg-lists/access/common
index 3690b8fbf..a3aefd6e5 100644
--- a/build/pkg-lists/access/common
+++ b/build/pkg-lists/access/common
@@ -4,7 +4,6 @@
 localechooser *
 load-floppy
 floppy-retriever *
-busybox-cvs-udeb
 di-utils-terminfo
 cdebconf-text-udeb
 brltty-udeb
diff --git a/build/pkg-lists/base b/build/pkg-lists/base
index aab8cba7e..b2f6b46e7 100644
--- a/build/pkg-lists/base
+++ b/build/pkg-lists/base
@@ -1,5 +1,6 @@
 # These udebs will be needed on nearly every image. Include this file to
 # get them.
+busybox
 anna
 archdetect
 cdebconf-udeb
diff --git a/build/pkg-lists/bootfloppy/i386.cfg b/build/pkg-lists/bootfloppy/i386.cfg
index b13a97c9c..c66f7e391 100644
--- a/build/pkg-lists/bootfloppy/i386.cfg
+++ b/build/pkg-lists/bootfloppy/i386.cfg
@@ -4,7 +4,7 @@
 # Neither is much else.
 rootskel-bootfloppy
 di-utils-bootfloppy
-busybox-cvs-floppy-udeb
+busybox-floppy-udeb
 floppy-modules-${kernel:Version}
 fat-modules-${kernel:Version}
 # Include support for USB floppy drives, and other storage media.
diff --git a/build/pkg-lists/cdrom-apus/common b/build/pkg-lists/cdrom-apus/common
index 75b1ce357..501481f9e 100644
--- a/build/pkg-lists/cdrom-apus/common
+++ b/build/pkg-lists/cdrom-apus/common
@@ -2,7 +2,6 @@
 #include "kernel"
 
 # Other udebs that are needed for CDROM install
-busybox-cvs-udeb
 rootskel-locale
 localechooser *
 hw-detect
diff --git a/build/pkg-lists/cdrom-minimal/common b/build/pkg-lists/cdrom-minimal/common
index 9ccd83eeb..e86dd9892 100644
--- a/build/pkg-lists/cdrom-minimal/common
+++ b/build/pkg-lists/cdrom-minimal/common
@@ -1,6 +1,5 @@
 #include "base"
 #include "kernel"
-#include "busybox"
 
 # Other udebs that are needed for CDROM install
 rootskel-locale
diff --git a/build/pkg-lists/cdrom/common b/build/pkg-lists/cdrom/common
index 9ccd83eeb..e86dd9892 100644
--- a/build/pkg-lists/cdrom/common
+++ b/build/pkg-lists/cdrom/common
@@ -1,6 +1,5 @@
 #include "base"
 #include "kernel"
-#include "busybox"
 
 # Other udebs that are needed for CDROM install
 rootskel-locale
diff --git a/build/pkg-lists/floppy/common b/build/pkg-lists/floppy/common
index fe889d1ca..43237905c 100644
--- a/build/pkg-lists/floppy/common
+++ b/build/pkg-lists/floppy/common
@@ -11,7 +11,6 @@
 # and so depmod will have a kernel to run against.
 #include "kernel"
 
-busybox-cvs-udeb
 localechooser *
 bogl-bterm-udeb
 di-utils-terminfo
diff --git a/build/pkg-lists/generic/common b/build/pkg-lists/generic/common
index 592dcef17..7776f6fb5 100644
--- a/build/pkg-lists/generic/common
+++ b/build/pkg-lists/generic/common
@@ -2,7 +2,6 @@
 #include "kernel"
 
 # Other udebs that are needed for netboot install
-busybox-cvs-udeb
 choose-mirror
 net-retriever
 download-installer
diff --git a/build/pkg-lists/hd-media/common b/build/pkg-lists/hd-media/common
index c221e5ae5..9042cd0b2 100644
--- a/build/pkg-lists/hd-media/common
+++ b/build/pkg-lists/hd-media/common
@@ -1,6 +1,5 @@
 #include "base"
 #include "kernel"
-#include "busybox"
 
 rootskel-locale
 localechooser *
diff --git a/build/pkg-lists/kernel_specific/2.2/busybox b/build/pkg-lists/kernel_specific/2.2/busybox
deleted file mode 100644
index c3dc607c9..000000000
--- a/build/pkg-lists/kernel_specific/2.2/busybox
+++ /dev/null
@@ -1,2 +0,0 @@
-# For busybox, just the standard one will do.
-busybox-cvs-udeb
diff --git a/build/pkg-lists/kernel_specific/2.4/busybox b/build/pkg-lists/kernel_specific/2.4/busybox
deleted file mode 100644
index c3dc607c9..000000000
--- a/build/pkg-lists/kernel_specific/2.4/busybox
+++ /dev/null
@@ -1,2 +0,0 @@
-# For busybox, just the standard one will do.
-busybox-cvs-udeb
diff --git a/build/pkg-lists/kernel_specific/2.6/busybox b/build/pkg-lists/kernel_specific/2.6/busybox
deleted file mode 100644
index c23b9ccef..000000000
--- a/build/pkg-lists/kernel_specific/2.6/busybox
+++ /dev/null
@@ -1,4 +0,0 @@
-# Unfortunatly, busybox lacks 2.6 modutils support.
-busybox-cvs-udeb
-# Get modutils from here for now.
-module-init-tools-udeb
diff --git a/build/pkg-lists/monolithic/common b/build/pkg-lists/monolithic/common
index c70e92f66..25d57094f 100644
--- a/build/pkg-lists/monolithic/common
+++ b/build/pkg-lists/monolithic/common
@@ -8,8 +8,6 @@
 #include "standard-udebs"
 #include "kernel-module-udebs"
 
-#include "busybox"
-
 # Other udebs that are not standard priority, but are still needed.
 # Note that some of these are due to broken dependencies of standard
 # priotity udebs.
diff --git a/build/pkg-lists/nativehd/common b/build/pkg-lists/nativehd/common
index abed243d4..ba058df13 100644
--- a/build/pkg-lists/nativehd/common
+++ b/build/pkg-lists/nativehd/common
@@ -3,7 +3,6 @@
 #include "kernel"
 
 # Other udebs that are needed for netboot install
-busybox-cvs-udeb
 localechooser *
 choose-mirror
 net-retriever
diff --git a/build/pkg-lists/netboot-apus/common b/build/pkg-lists/netboot-apus/common
index bcc5bccc4..bd7ada66f 100644
--- a/build/pkg-lists/netboot-apus/common
+++ b/build/pkg-lists/netboot-apus/common
@@ -1,6 +1,5 @@
 #include "base"
 #include "kernel"
-#include "busybox"
 
 # Other udebs that are needed for netboot install
 localechooser *
diff --git a/build/pkg-lists/netboot-minimal/common b/build/pkg-lists/netboot-minimal/common
index a18997569..307df2b87 100644
--- a/build/pkg-lists/netboot-minimal/common
+++ b/build/pkg-lists/netboot-minimal/common
@@ -1,6 +1,5 @@
 #include "base"
 #include "kernel"
-#include "busybox"
 
 # Other udebs that are needed for netboot install
 localechooser *
diff --git a/build/pkg-lists/netboot/common b/build/pkg-lists/netboot/common
index 1ad65adde..d05a283c2 100644
--- a/build/pkg-lists/netboot/common
+++ b/build/pkg-lists/netboot/common
@@ -1,6 +1,5 @@
 #include "base"
 #include "kernel"
-#include "busybox"
 
 # Other udebs that are needed for netboot install
 localechooser *
diff --git a/build/pkg-lists/speakup/common b/build/pkg-lists/speakup/common
index 2a55524ac..d2dbc6c1a 100644
--- a/build/pkg-lists/speakup/common
+++ b/build/pkg-lists/speakup/common
@@ -4,5 +4,5 @@
 # Neither is much else.
 rootskel-bootfloppy
 di-utils-bootfloppy
-busybox-cvs-floppy-udeb
+busybox-floppy-udeb
 #include "kernel"
diff --git a/debian/changelog b/debian/changelog
index dfad4e81a..f37bd5955 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-debian-installer (trunk) UNRELEASED; urgency=low
+debian-installer (20050630) unstable; urgency=low
 
   [ Joey Hess ]
   * Add preseed-common to all initrds, split out from file/network-preseed.
@@ -106,6 +106,9 @@ debian-installer (trunk) UNRELEASED; urgency=low
   * Try to pass appropriate manual_release when building the manual in rules
     file.
   * Switch to slang2.
+  * Switch from busybox-cvs to busybox.
+  * New busybox supports 2.6 modules, so the hack with modutils-udeb is not
+    needed anymore.
 
   [ Kurt Roeckx ]
   * Changed libdevmapper1.00-udeb to libdevmapper1.01-udeb in the monolithic
@@ -161,7 +164,7 @@ debian-installer (trunk) UNRELEASED; urgency=low
   [ Eddy Petrisor ]
   * Removed ASCII characters from needed-characters/vi
 
- -- Joey Hess <joeyh@debian.org>  Fri, 24 Jun 2005 15:50:52 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu, 30 Jun 2005 17:03:17 -0400
 
 debian-installer (20050317) unstable; urgency=low