diff --git a/helpers/DATA/apt/trisquel/sources.list.in b/helpers/DATA/apt/trisquel/sources.list.in
index 5a190e8a4433c202c93acf6b133184cf401f7ed4..9c530baa189b3f785e1687ac0d10fca5d6a35ef5 100644
--- a/helpers/DATA/apt/trisquel/sources.list.in
+++ b/helpers/DATA/apt/trisquel/sources.list.in
@@ -1,10 +1,10 @@
 # See sources.list(5) manpage for more information
 # Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool.
-deb http://es.archive.trisquel.org/trisquel &trisquel-codename; main
-deb-src http://es.archive.trisquel.org/trisquel &trisquel-codename; main
+deb http://archive.trisquel.org/trisquel &trisquel-codename; main
+deb-src http://archive.trisquel.org/trisquel &trisquel-codename; main
 
-deb http://es.archive.trisquel.org/trisquel &trisquel-codename;-security main
-deb-src http://es.archive.trisquel.org/trisquel &trisquel-codename;-security main
+deb http://archive.trisquel.org/trisquel &trisquel-codename;-security main
+deb-src http://archive.trisquel.org/trisquel &trisquel-codename;-security main
 
-deb http://es.archive.trisquel.org/trisquel &trisquel-codename;-updates main
-deb-src http://es.archive.trisquel.org/trisquel &trisquel-codename;-updates main
+deb http://archive.trisquel.org/trisquel &trisquel-codename;-updates main
+deb-src http://archive.trisquel.org/trisquel &trisquel-codename;-updates main
diff --git a/helpers/make-apt b/helpers/make-apt
index 5bb8c5f9be8e4c1ef650b071acbb08e866c22706..350264c32e1616f14edf89577b6140763c0516a2 100644
--- a/helpers/make-apt
+++ b/helpers/make-apt
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=3
+VERSION=4
 COMPONENT=main
 
 . ./config
@@ -26,6 +26,7 @@ cp $DATA/trisquel vendor -a
 
 replace ubuntu-codename trisquel-codename .
 replace Ubuntu Trisquel .
+sed -i "s|trisquel-codename \".*\"|trisquel-codename \"$CODENAME\"|" doc/apt-verbatim.ent
 
 replace "http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg" "http://archive.trisquel.org/trisquel/trisquel-archive-signkey.gpg" .
 replace ubuntu-keyring trisquel-keyring .
@@ -55,12 +56,12 @@ replace changelogs.ubuntu.com packages.trisquel.info .
 replace ubuntu.com/changelogs trisquel.info/changelogs .
 
 cat << EOF > ./test/interactive-helper/networkless-install-fixes/sources.test.list
-deb http://archive.trisquel.info/trisquel/ $CODENAME main
-deb-src http://archive.trisquel.info/trisquel/ $CODENAME main
-deb http://archive.trisquel.info/trisquel/ $CODENAME-updates main
-deb-src http://archive.trisquel.info/trisquel/ $CODENAME-updates main
-deb http://archive.trisquel.info/trisquel/ $CODENAME-security main
-deb-src http://archive.trisquel.info/trisquel/ $CODENAME-security main
+deb http://archive.trisquel.org/trisquel/ $CODENAME main
+deb-src http://archive.trisquel.org/trisquel/ $CODENAME main
+deb http://archive.trisquel.org/trisquel/ $CODENAME-updates main
+deb-src http://archive.trisquel.org/trisquel/ $CODENAME-updates main
+deb http://archive.trisquel.org/trisquel/ $CODENAME-security main
+deb-src http://archive.trisquel.org/trisquel/ $CODENAME-security main
 EOF
 
 cp ./test/interactive-helper/networkless-install-fixes/sources.test.list ./doc/examples/sources.list