diff --git a/CONF.sh b/CONF.sh
index 16719af8..d21678cd 100644
--- a/CONF.sh
+++ b/CONF.sh
@@ -204,10 +204,18 @@ ATTEMPT_FALLBACK=yes
 # DLDVD:             standard 8.5 GB dual-layer DVD
 # BD:                standard 25 GB blu-ray
 # DLBD:              standard 50 GB dual-layer blu-ray
+# STICK1GB:          1GB USB stick or similar
+# STICK2GB:          2GB USB stick or similar
+# STICK4GB:          4GB USB stick or similar
+# STICK8GB:          8GB USB stick or similar
 # CUSTOM:            up to you - specify a size to go with it (in 2K blocks)
 export DISKTYPE=CD
 #export DISKTYPE=CUSTOM
 #export CUSTOMSIZE=XXXX
+# If you want to over-ride this choice (e.g. to make a larger version of a given disk),
+# you can do the following:
+# export FORCE_CD_SIZE=<type> to change all the sizes in a given run
+# export FORCE_CD_SIZE1=<type> to change the size of disk 1 (only)
 
 # List of languages for which language tasks from tasksel should be
 # included. See tasks/README.tasksel for further info.
diff --git a/debian/CONF.sh b/debian/CONF.sh
index 16719af8..d21678cd 100644
--- a/debian/CONF.sh
+++ b/debian/CONF.sh
@@ -204,10 +204,18 @@ ATTEMPT_FALLBACK=yes
 # DLDVD:             standard 8.5 GB dual-layer DVD
 # BD:                standard 25 GB blu-ray
 # DLBD:              standard 50 GB dual-layer blu-ray
+# STICK1GB:          1GB USB stick or similar
+# STICK2GB:          2GB USB stick or similar
+# STICK4GB:          4GB USB stick or similar
+# STICK8GB:          8GB USB stick or similar
 # CUSTOM:            up to you - specify a size to go with it (in 2K blocks)
 export DISKTYPE=CD
 #export DISKTYPE=CUSTOM
 #export CUSTOMSIZE=XXXX
+# If you want to over-ride this choice (e.g. to make a larger version of a given disk),
+# you can do the following:
+# export FORCE_CD_SIZE=<type> to change all the sizes in a given run
+# export FORCE_CD_SIZE1=<type> to change the size of disk 1 (only)
 
 # List of languages for which language tasks from tasksel should be
 # included. See tasks/README.tasksel for further info.
diff --git a/debian/changelog b/debian/changelog
index 0a6676fe..d9a86f32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ debian-cd (3.1.6) UNRELEASED; urgency=low
     "s/squeeze/wheezy/" in various places.
   * Add support for over-riding disc size on demand, used for some of the
     squeeze release builds.
+  * Add disk size definitions for 1/2/4/8 GB USB sticks.
+  * Extend the size-override code to allow to override an individual disc
+    in the set (e.g. to make the first DVD fit on a 4GB USB stick).
 
   [ Otavio Salvador ]
   * Add btrfs-tools on required packages by installer. Closes: #612007.
diff --git a/tools/make_disc_trees.pl b/tools/make_disc_trees.pl
index 8e4bc857..83318f63 100755
--- a/tools/make_disc_trees.pl
+++ b/tools/make_disc_trees.pl
@@ -115,6 +115,7 @@ my $size_check = "";
 # Constants used for space calculations
 my $MiB = 1048576;
 my $MB = 1000000;
+my $GB = 1000000000;
 my $blocksize = 2048;
 my ($maxdiskblocks, $diskdesc);
 my $cddir;
@@ -542,6 +543,7 @@ sub get_disc_size {
     my $error = 0;
     my $reserved = 0;
     my $chosen_disk = $disktype;
+    my $disk_size_hack = "";
 
     if (defined($ENV{'RESERVED_BLOCKS_HOOK'})) {
         $hook = $ENV{'RESERVED_BLOCKS_HOOK'};
@@ -554,9 +556,19 @@ sub get_disc_size {
         print "  Reserving $reserved blocks on CD $disknum\n";
     }
 
-    my $disk_size_hack = $ENV{'FORCE_CD_SIZE'} || "";
+    # See if we've been asked to switch sizes for the whole set
+    $disk_size_hack = $ENV{'FORCE_CD_SIZE'} || "";
     if ($disk_size_hack) {
-       print LOG "HACK HACK HACK: Forcing use of a $disk_size_hack disk instead of $disktype\n";
+       print LOG "HACK HACK HACK: FORCE_CD_SIZE found:\n";
+       print LOG "  forcing use of a $disk_size_hack disk instead of $chosen_disk\n";
+       $chosen_disk = $disk_size_hack;
+    }
+
+    # If we're asked to do a specific size for *this* disknum, over-ride again
+    $disk_size_hack = $ENV{"FORCE_CD_SIZE$disknum"} || "";
+    if ($disk_size_hack) {
+       print LOG "HACK HACK HACK: FORCE_CD_SIZE$disknum found:\n";
+       print LOG "  forcing use of a $disk_size_hack disk instead of $chosen_disk\n";
        $chosen_disk = $disk_size_hack;
     }
 
@@ -587,6 +599,18 @@ sub get_disc_size {
 		# Useable capacity, found by checking some disks
         $maxdiskblocks = 23652352 - $reserved;
         $diskdesc = "50GB DLBD";
+    } elsif ($chosen_disk eq "STICK1GB") {
+        $maxdiskblocks = int(1 * $GB / $blocksize) - $reserved;
+        $diskdesc = "1GB STICK";
+    } elsif ($chosen_disk eq "STICK2GB") {
+        $maxdiskblocks = int(2 * $GB / $blocksize) - $reserved;
+        $diskdesc = "2GB STICK";
+    } elsif ($chosen_disk eq "STICK4GB") {
+        $maxdiskblocks = int(4 * $GB / $blocksize) - $reserved;
+        $diskdesc = "4GB STICK";
+    } elsif ($chosen_disk eq "STICK8GB") {
+        $maxdiskblocks = int(8 * $GB / $blocksize) - $reserved;
+        $diskdesc = "8GB STICK";
     } elsif ($chosen_disk eq "CUSTOM") {
         $maxdiskblocks = $ENV{'CUSTOMSIZE'}  - $reserved || 
             die "Need to specify a custom size for the CUSTOM disktype\n";