diff --git a/helpers/make-pbuilder b/helpers/make-pbuilder
index 93b742d171a66c5c5097982c5399b88713fcf428..518370e9f9d3988160448c13ad13e5bdf5027121 100644
--- a/helpers/make-pbuilder
+++ b/helpers/make-pbuilder
@@ -1,6 +1,7 @@
 #!/bin/bash
 #
 #    Copyright (C) 2016  Kevin Peng <kkpengboy@gmail.com>
+#    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
@@ -17,12 +18,13 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=1
+VERSION=2
 
 . ./config
 
-sed "s/archive\.ubuntu\.com\/ubuntu/archive\.trisquel\.info\/trisquel/g" -i debian/rules
-sed "s/$UPSTREAM/$CODENAME/g" -i debian/rules
+sed "s/archive\.ubuntu\.com\/ubuntu/archive\.trisquel\.org\/trisquel/g" -i debian/rules
+sed "s/devel/$CODENAME/g" -i debian/rules
+sed "s/main universe/main/" -i debian/rules
 
 changelog "Rebrand for Trisquel"
 compile