diff --git a/helpers/make-cabal-install-1.20 b/helpers/make-cabal-install-1.20
index 1836475d09099a75e9c62475b5b79a65b255eacd..38e3e4b583e34f15b558bb12a4f5eef8e8455274 100644
--- a/helpers/make-cabal-install-1.20
+++ b/helpers/make-cabal-install-1.20
@@ -17,7 +17,7 @@
 
 VERSION=1
 EXTERNAL='deb-src http://ppa.launchpad.net/hvr/ghc/ubuntu $UPSTREAM main'
-SIGNKEY=FF3AEACEF6F88286
+REPOKEY=FF3AEACEF6F88286
 
 . ./config
 
diff --git a/helpers/make-ddccontrol b/helpers/make-ddccontrol
index b45b41075c9410f2d17e8af3f6836907dd846b5c..5dc22e3f9ae3ac34e0eea03b8cb5f3865e7a6f15 100644
--- a/helpers/make-ddccontrol
+++ b/helpers/make-ddccontrol
@@ -19,7 +19,7 @@
 
 VERSION=1
 EXTERNAL='deb-src http://ftp.us.debian.org/debian jessie main'
-SIGNKEY="7638D0442B90D010"
+
 . ./config
 
 changelog "Imported into Trisquel"
diff --git a/helpers/make-ddccontrol-db b/helpers/make-ddccontrol-db
index b45b41075c9410f2d17e8af3f6836907dd846b5c..5dc22e3f9ae3ac34e0eea03b8cb5f3865e7a6f15 100644
--- a/helpers/make-ddccontrol-db
+++ b/helpers/make-ddccontrol-db
@@ -19,7 +19,7 @@
 
 VERSION=1
 EXTERNAL='deb-src http://ftp.us.debian.org/debian jessie main'
-SIGNKEY="7638D0442B90D010"
+
 . ./config
 
 changelog "Imported into Trisquel"
diff --git a/helpers/make-debian-reference b/helpers/make-debian-reference
index 18717b20a8ed008ed6224bfb449e10981f001607..dc0915d8d9ba55e945c3005cd46395ea91865cd6 100644
--- a/helpers/make-debian-reference
+++ b/helpers/make-debian-reference
@@ -19,7 +19,6 @@
 
 # One release to rule them all :)
 EXTERNAL='deb-src http://ftp.es.debian.org/debian/ jessie main'
-SIGNKEY="46925553"
 
 VERSION=1
 
diff --git a/helpers/make-electrum b/helpers/make-electrum
index 8d8db2c4f02ce9f4df78af722d8cada97e21cd50..2d457b46bd6fd3ecbcdeb6881e4658fa8fcf0247 100644
--- a/helpers/make-electrum
+++ b/helpers/make-electrum
@@ -19,7 +19,7 @@
 
 VERSION=1
 EXTERNAL="deb-src http://ftp.debian.org/debian testing main"
-SIGNKEY="46925553"
+SIGNKEY="1F637893"
 
 apt-get install --force-yes -y debian-archive-keyring
 
diff --git a/helpers/make-eviacam b/helpers/make-eviacam
index 6f8370650eb91370711026abfb77b230dcc5ecbc..b4a93a174337c74e75a06f49a366552746bff7e3 100644
--- a/helpers/make-eviacam
+++ b/helpers/make-eviacam
@@ -19,7 +19,8 @@
 
 VERSION=1
 EXTERNAL='deb-src http://ppa.launchpad.net/cesar-crea-si/eviacam/ubuntu  $UPSTREAM main'
-SIGNKEY="14C5A991"
+SIGNKEY="87CE47C2"
+REPOKEY="6C9D15D314C5A991"
 
 . ./config
 
diff --git a/helpers/make-filteraudio b/helpers/make-filteraudio
index 9ed61c1511f0b6cf5fa405eb437f5dc81f8c3aa6..6e88ad273fa97d6cfac9caf1ce4bd364e0bef117 100644
--- a/helpers/make-filteraudio
+++ b/helpers/make-filteraudio
@@ -17,7 +17,7 @@
 
 VERSION=1
 EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main'
-SIGNKEY=D1386E5F3FC3365C
+REPOKEY=D1386E5F3FC3365C
 
 . ./config
 
diff --git a/helpers/make-ghc-7.8.3 b/helpers/make-ghc-7.8.3
index 9eff190511048bc9f9fb80ca152274a833c8c1ca..1d302b216f796f5ef39daeb82189ecb85ce8852d 100644
--- a/helpers/make-ghc-7.8.3
+++ b/helpers/make-ghc-7.8.3
@@ -17,7 +17,7 @@
 
 VERSION=1
 EXTERNAL='deb-src http://ppa.launchpad.net/hvr/ghc/ubuntu $UPSTREAM main'
-SIGNKEY=FF3AEACEF6F88286
+REPOKEY=FF3AEACEF6F88286
 
 . ./config
 
diff --git a/helpers/make-handbrake b/helpers/make-handbrake
index 3e68818503edb0780cc0d815bacafa0d2956ef08..09a88265e00b3a21442cc8af0358acc3d07e87ea 100644
--- a/helpers/make-handbrake
+++ b/helpers/make-handbrake
@@ -19,7 +19,8 @@
 
 VERSION=1
 EXTERNAL='deb-src http://ppa.launchpad.net/stebbins/handbrake-snapshots/ubuntu/ $UPSTREAM main'
-SIGNKEY="816950D8"
+SIGNKEY="30CC05C8"
+REPOKEY="8771ADB0816950D8"
 
 . ./config
 
diff --git a/helpers/make-icecat b/helpers/make-icecat
index 60e43598906ad95aec1812de327ba9a21add3977..b9622a9595029dfa0c2d4a3549e4fb44e6359262 100644
--- a/helpers/make-icecat
+++ b/helpers/make-icecat
@@ -20,6 +20,7 @@
 VERSION=1
 EXTERNAL='deb-src http://devel.trisquel.info/repos/packages/icecat/ GNU main'
 SIGNKEY="D7E04784"
+REPOKEY="3C76EED7D7E04784"
 
 . ./config
 
diff --git a/helpers/make-pkglab b/helpers/make-pkglab
index 2f018b77ede31181b572113c3d42c1ef7ed35b5f..e2e639cfa1f3aaa1de7604e33e0ac45688464aec 100644
--- a/helpers/make-pkglab
+++ b/helpers/make-pkglab
@@ -19,7 +19,6 @@
 
 VERSION=1
 EXTERNAL='deb-src http://ftp.us.debian.org/debian stable  main'
-SIGNKEY="46925553"
 
 . ./config
 
diff --git a/helpers/make-qelectrotech b/helpers/make-qelectrotech
index f4cd962487e291e18079cfa25d32aa73c2a223e7..4c0f6a83131aa92159ba6425a239efc766a08121 100644
--- a/helpers/make-qelectrotech
+++ b/helpers/make-qelectrotech
@@ -19,7 +19,7 @@
 
 VERSION=1
 EXTERNAL='deb-src http://debian.qelectrotech.org/qet/debian/ stable main'
-SIGNKEY="BC9F825E1D4FB6C1"
+REPOKEY="BC9F825E1D4FB6C1"
 
 . ./config
 
diff --git a/helpers/make-qtox b/helpers/make-qtox
index 9ed61c1511f0b6cf5fa405eb437f5dc81f8c3aa6..6e88ad273fa97d6cfac9caf1ce4bd364e0bef117 100644
--- a/helpers/make-qtox
+++ b/helpers/make-qtox
@@ -17,7 +17,7 @@
 
 VERSION=1
 EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main'
-SIGNKEY=D1386E5F3FC3365C
+REPOKEY=D1386E5F3FC3365C
 
 . ./config
 
diff --git a/helpers/make-tor b/helpers/make-tor
index d1f5930b713717391e0fca1f9b762d7a4ef0cf56..65f8f0f3001d2f5adae4950c1a52f5135056500b 100644
--- a/helpers/make-tor
+++ b/helpers/make-tor
@@ -19,7 +19,7 @@
 
 VERSION=1
 EXTERNAL='deb-src http://deb.torproject.org/torproject.org trusty main'
-SIGNKEY="886DDD89"
+REPOKEY="74A941BA219EC810"
 
 . ./config
 
diff --git a/helpers/make-toxcore b/helpers/make-toxcore
index 9ed61c1511f0b6cf5fa405eb437f5dc81f8c3aa6..646ac85d2194622bddec88d83e584026ffde1694 100644
--- a/helpers/make-toxcore
+++ b/helpers/make-toxcore
@@ -17,7 +17,7 @@
 
 VERSION=1
 EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main'
-SIGNKEY=D1386E5F3FC3365C
+REPOKEY="D1386E5F3FC3365C"
 
 . ./config
 
diff --git a/helpers/make-toxic b/helpers/make-toxic
index 9ed61c1511f0b6cf5fa405eb437f5dc81f8c3aa6..646ac85d2194622bddec88d83e584026ffde1694 100644
--- a/helpers/make-toxic
+++ b/helpers/make-toxic
@@ -17,7 +17,7 @@
 
 VERSION=1
 EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main'
-SIGNKEY=D1386E5F3FC3365C
+REPOKEY="D1386E5F3FC3365C"
 
 . ./config
 
diff --git a/helpers/make-utox b/helpers/make-utox
index 9ed61c1511f0b6cf5fa405eb437f5dc81f8c3aa6..646ac85d2194622bddec88d83e584026ffde1694 100644
--- a/helpers/make-utox
+++ b/helpers/make-utox
@@ -17,7 +17,7 @@
 
 VERSION=1
 EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main'
-SIGNKEY=D1386E5F3FC3365C
+REPOKEY="D1386E5F3FC3365C"
 
 . ./config
 
diff --git a/helpers/make-youtube-dl b/helpers/make-youtube-dl
index 8aa1be5bf573b05ddb7b4191191c6c36de9915d6..59f2801a1409dfb6c259cbb49c0d10cf5911301a 100644
--- a/helpers/make-youtube-dl
+++ b/helpers/make-youtube-dl
@@ -19,7 +19,7 @@
 
 VERSION=1
 EXTERNAL='deb-src http://ppa.launchpad.net/nilarimogard/webupd8/ubuntu $UPSTREAM main'
-SIGNKEY="531EE72F4C9D234C"
+REPOKEY="531EE72F4C9D234C"
 
 . ./config
 
diff --git a/helpers/make-zam-plugins b/helpers/make-zam-plugins
index dd5e55fa2e1ffa38a5d5f59a471336cf2437b440..d1682eec8e2b6c11ca7920efc6d187482787fa33 100644
--- a/helpers/make-zam-plugins
+++ b/helpers/make-zam-plugins
@@ -19,7 +19,6 @@
 
 VERSION=1
 EXTERNAL='deb-src http://ftp.debian.org/debian testing main'
-SIGNKEY="8B48AD6246925553"
 
 . ./config