diff --git a/helpers/DATA/apt/trisquel/apt-vendor.ent b/helpers/DATA/apt/trisquel/apt-vendor.ent
index 53dbf4ddace3495ac8471d6373bb02594e30a665..abab8a79e4f996c58b4cc83c897364ae532719be 100644
--- a/helpers/DATA/apt/trisquel/apt-vendor.ent
+++ b/helpers/DATA/apt/trisquel/apt-vendor.ent
@@ -4,17 +4,17 @@
 <!ENTITY keyring-filename "<filename>/usr/share/keyrings/trisquel-archive-keyring.gpg</filename>">
 <!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/trisquel-archive-removed-keys.gpg</filename>">
 <!ENTITY keyring-master-filename "/usr/share/keyrings/trisquel-master-keyring.gpg">
-<!ENTITY keyring-uri "http://archive.trisquel.info/trisquel/trisquel-archive-signkey.gpg">
+<!ENTITY keyring-uri "http://archive.trisquel.org/trisquel/trisquel-archive-signkey.gpg">
 
-<!ENTITY sourceslist-list-format "deb http://es.archive.trisquel.info/trisquel &trisquel-codename; main
-deb http://es.archive.trisquel.info/trisquel &trisquel-codename;-security main
-deb http://es.archive.trisquel.info/trisquel &trisquel-codename;-updates main">
+<!ENTITY sourceslist-list-format "deb http://es.archive.trisquel.org/trisquel &trisquel-codename; main
+deb http://es.archive.trisquel.org/trisquel &trisquel-codename;-security main
+deb http://es.archive.trisquel.org/trisquel &trisquel-codename;-updates main">
 <!ENTITY sourceslist-sources-format "Types: deb
-URIs: http://es.archive.trisquel.info/trisquel
+URIs: http://es.archive.trisquel.org/trisquel
 Suites: &trisquel-codename; &trisquel-codename;-updates
 Components: main
 
 Types: deb
-URIs: http://es.archive.trisquel.info/trisquel
+URIs: http://es.archive.trisquel.org/trisquel
 Suites: &trisquel-codename;-security
 Components: main">
diff --git a/helpers/DATA/apt/trisquel/sources.list.in b/helpers/DATA/apt/trisquel/sources.list.in
index 7b4b8dbff50e25171f8adeb7148e8acc7c7b9e76..5a190e8a4433c202c93acf6b133184cf401f7ed4 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.info/trisquel &trisquel-codename; main
-deb-src http://es.archive.trisquel.info/trisquel &trisquel-codename; main
+deb http://es.archive.trisquel.org/trisquel &trisquel-codename; main
+deb-src http://es.archive.trisquel.org/trisquel &trisquel-codename; main
 
-deb http://es.archive.trisquel.info/trisquel &trisquel-codename;-security main
-deb-src http://es.archive.trisquel.info/trisquel &trisquel-codename;-security 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://es.archive.trisquel.info/trisquel &trisquel-codename;-updates main
-deb-src http://es.archive.trisquel.info/trisquel &trisquel-codename;-updates main
+deb http://es.archive.trisquel.org/trisquel &trisquel-codename;-updates main
+deb-src http://es.archive.trisquel.org/trisquel &trisquel-codename;-updates main
diff --git a/helpers/make-apt b/helpers/make-apt
index 0e5350c2484aa67ad267addec73bab8aab71a5f1..b69373dab460dad3a831717640a93dbce2283853 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=1
+VERSION=2
 COMPONENT=main
 
 . ./config
@@ -27,7 +27,7 @@ cp $DATA/trisquel vendor -a
 replace ubuntu-codename trisquel-codename .
 replace Ubuntu Trisquel .
 
-replace "http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg" "http://archive.trisquel.info/trisquel/trisquel-archive-signkey.gpg" .
+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 .
 replace ubuntu-archive-keyring trisquel-archive-keyring .
 
diff --git a/helpers/make-doxygen b/helpers/make-doxygen
index bda0b01765d6f8768ab8b12a82d072c26441aa0c..fcd825881715796e4e4066f2ffaa60e33ca8d4c8 100644
--- a/helpers/make-doxygen
+++ b/helpers/make-doxygen
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
 #    Copyright (C) 2015 fr33domlover <fr33domlover@riseup.net>
+#    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -15,11 +16,15 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-VERSION=1
+VERSION=2
 
 . ./config
 
-sed -i 's/Firefox, Chrome, Safari, or Opera/GNU IceCat, Abrowser, Epiphany, or Midori/g' src/dot.cpp
+sed -i 's|Firefox, Chrome, Safari, or Opera|GNU IceCat, Abrowser, Epiphany, or Midori|g' src/dotfilepatcher.cpp
+sed -i 's|Firefox, Chrome, Safari, or Opera|GNU IceCat, Abrowser, Epiphany, or Midori|g' src/htmldocvisitor.cpp
+sed -i 's|Firefox, Chrome, Safari, and Opera|GNU IceCat, Abrowser, Epiphany|g' src/config.xml
+sed -i 's|Mozilla Firefox, Google Chrome, Safari|GNU IceCat, Abrowser, Epiphany|g' doc/starting.doc
+find . -type f -exec sed -i 's|Firefox|Abrowser|g' {} +
 
 changelog "Replace references to nonfree browsers to freedom respecting ones"