diff --git a/data/sarge/exclude-udebs-i386 b/data/sarge/exclude-udebs-i386
index 9974a78e..3173acf1 100644
--- a/data/sarge/exclude-udebs-i386
+++ b/data/sarge/exclude-udebs-i386
@@ -27,3 +27,10 @@ userdevfs
 # The speakup kernel modules are not useful unless the access images are
 # provided.
 *-speakup-di
+# These packages are for the old partitioning system, and should not be
+# included as they confuse users.
+# Note that partconf-find-partitions is used by lvmcfg-utils, so is not
+# excluded.
+partconf
+partconf-mkfstab
+partitioner
diff --git a/debian/changelog b/debian/changelog
index 9f5307b7..ad309b1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,8 @@ debian-cd (2.2.17) UNRELEASED; urgency=low
       translatons and all the scsi drivers.
     - Drop lowmemcheck from the CD; it is in the initrd.
     - Add wireless-tools to generate_d-i+k_list
+    - Remove the old partitioner from the CD for i386. (This should also be
+      done for other arches for which it is not default)
   * Steve Langasek
     - Add fdisk-udeb to the list of needed debs for alpha
     - Use /dev/ram as the root device for aboot (alpha)