diff --git a/CONF.sh b/CONF.sh
index 004c2247..3d04905c 100644
--- a/CONF.sh
+++ b/CONF.sh
@@ -236,6 +236,7 @@ ATTEMPT_FALLBACK=yes
 # STICK2GB:          2GB USB stick or similar
 # STICK4GB:          4GB USB stick or similar
 # STICK8GB:          8GB USB stick or similar
+# STICK16GB:         16GB USB stick or similar
 # CUSTOM:            up to you - specify a size to go with it (in 2K blocks)
 export DISKTYPE=CD
 #export DISKTYPE=CUSTOM
diff --git a/debian/changelog b/debian/changelog
index d529bd97..8616b8f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ debian-cd (3.1.24) UNRELEASED; urgency=medium
     jigdo files, to reduce load on the service.
   * Don't include -686-pae udebs on media - we may not have a kernel
     to use with them anyway
+  * Add explicit support for 16G USB sticks
 
  -- Holger Levsen <holger@debian.org>  Wed, 20 Feb 2019 14:12:16 +0100
 
diff --git a/tools/make_disc_trees.pl b/tools/make_disc_trees.pl
index be83f672..e7587c8a 100755
--- a/tools/make_disc_trees.pl
+++ b/tools/make_disc_trees.pl
@@ -769,6 +769,9 @@ sub get_disc_size {
     } elsif ($chosen_disk eq "STICK8GB") {
         $maxdiskblocks = int(8 * $GB / $blocksize) - $reserved;
         $diskdesc = "8GB STICK";
+    } elsif ($chosen_disk eq "STICK16GB") {
+        $maxdiskblocks = int(16 * $GB / $blocksize) - $reserved;
+        $diskdesc = "16GB STICK";
     } elsif ($chosen_disk eq "CUSTOM") {
         $maxdiskblocks = $ENV{'CUSTOMSIZE'} - $reserved || 
             die "Need to specify a custom size for the CUSTOM disktype\n";