diff --git a/helpers/DATA/choose-mirror/rev_choose-mirror-bin.templates-in.patch b/helpers/DATA/choose-mirror/rev_choose-mirror-bin.templates-in.patch
index 2638a729ba61600595112b200a30b8e525cae996..8976574dc9c145403c696e2ee340b1fbe1e321ce 100644
--- a/helpers/DATA/choose-mirror/rev_choose-mirror-bin.templates-in.patch
+++ b/helpers/DATA/choose-mirror/rev_choose-mirror-bin.templates-in.patch
@@ -5,7 +5,7 @@ diff -ru choose-mirror-2.78ubuntu7+10.0trisquel3/debian/choose-mirror-bin.templa
  Type: select
  Choices-C: ${CHOICES-C}
  Choices: ${CHOICES}
--Default: nabia
+-Default: _CODENAME_
 -Description: Trisquel version to install:
 - In Trisquel, this question is never asked, and is only for preseeding.
 - Caveat emptor.
diff --git a/helpers/make-choose-mirror b/helpers/make-choose-mirror
index 6953a8528d27f4c6cfbc846df86fb168c5d8e06e..c295ca9af8716267321bffb88a9cab2496e42f32 100644
--- a/helpers/make-choose-mirror
+++ b/helpers/make-choose-mirror
@@ -18,7 +18,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=4
+VERSION=5
 EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
 REPOKEY=648ACFD622F3D138
 NETINST=true
@@ -32,6 +32,7 @@ sed -i '/oldstable/d;
         /unstable/d;' mirrors.h
 sed -i "s|stable|$CODENAME|" mirrors.h
 
+replace "_CODENAME_" "$CODENAME"
 replace "deb.debian.org" "archive.trisquel.org" .
 replace "debian.org" "trisquel.org" .
 replace "Debian" "Trisquel" .