diff --git a/debian/changelog b/debian/changelog
index a5012d59..7f581210 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ debian-cd (2.2.8) unstable; urgency=low
   * UNRELEASED. 
   * Be less restrictive on non-US section name (ie accepts non-us too).
   * Add support for ia64 (Richard Hirst).  Closes #110553.
+  * Update the "Components" field of the Release files. Was
+    causing a bug in debootstrap.
 
  -- Raphael Hertzog <hertzog@debian.org>  Sun, 19 Aug 2001 13:42:27 +0200
 
diff --git a/tasks/task-woody b/tasks/task-woody
index 88f3612f..9ec1051e 100644
--- a/tasks/task-woody
+++ b/tasks/task-woody
@@ -83,6 +83,7 @@ python-bobo
 python-bobopos
 python-dev
 python-doc
+pythondoc
 python-examples
 python-extclass
 python-gdbm
@@ -108,7 +109,6 @@ python-pam
 python-pmw
 python-tk
 python-xml
-pythondoc
 qpopper
 rxvt-ml
 samba
diff --git a/tools/scanpackages b/tools/scanpackages
index df8cff83..febb600e 100755
--- a/tools/scanpackages
+++ b/tools/scanpackages
@@ -24,8 +24,10 @@ NUM=${PREFIX##$BDIR/}
 NUM=`echo $NUM | sed 's/_NONUS//g'`
 if [ -n "$NONFREE" -o -n "$EXTRANONFREE" ]; then
   SECTIONS="main contrib non-free"
+  SECTIONSNONUS="non-US/main non-US/contrib non-US/non-free"
 else
   SECTIONS="main contrib"
+  SECTIONSNONUS="non-US/main non-US/contrib"
 fi
 
 cd "$2"
@@ -34,8 +36,10 @@ if [ "$1" = "install" ]; then
 
 if [ -e "$MIRROR/dists/$CODENAME/Release" ]; then
     # Strip the MD5Sum and SHA1 fields
+    # Update some other information as well
     sed -e "s/^Architectures: .*$/Architectures: $ARCH/" \
     $MIRROR/dists/$CODENAME/Release | \
+    sed -e "s/^Components: .*$/Components: $SECTIONS/" | \
     perl -ne 'if (/^(MD5Sum|SHA1):/i) { $f=1; next } 
     if ($f) { 
 	unless (/^ /) { print; $f=0 }
@@ -43,8 +47,10 @@ if [ -e "$MIRROR/dists/$CODENAME/Release" ]; then
 fi
 if [ -n "$NONUS" -a -e "$NONUS/dists/$CODENAME/non-US/Release" ]; then
     # Strip the MD5Sum and SHA1 fields
+    # Update some other information as well
     sed -e "/^ /d" -e "s/^Architectures: .*$/Architectures: $ARCH/" \
     $NONUS/dists/$CODENAME/non-US/Release | \
+    sed -e "s/^Components: .*$/Components: $SECTIONSNONUS/" | \
     perl -ne 'if (/^(MD5Sum|SHA1):/i) { $f=1; next } 
     if ($f) { 
 	unless (/^ /) { print; $f=0 }