diff --git a/helpers/make-emacs b/helpers/make-emacs
new file mode 100644
index 0000000000000000000000000000000000000000..6cdd4ddd1c67552d5db9222141156848e8371157
--- /dev/null
+++ b/helpers/make-emacs
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+#    Copyright (C) 2022 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
+#    the Free Software Foundation; either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    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
+
+. ./config
+
+sed -i 's|emacs-common-non-dfsg|emacs-common-gfdl|g' debian/control
+
+changelog "Adjust emacs suggestion to emacs-common-gfdl"
+
+compile
diff --git a/helpers/make-emacs-non-dfsg b/helpers/make-emacs-non-dfsg
new file mode 100644
index 0000000000000000000000000000000000000000..bfdd776bd11f705c5572bdf751e5c44b546586d9
--- /dev/null
+++ b/helpers/make-emacs-non-dfsg
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+#    Copyright (C) 2022 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
+#    the Free Software Foundation; either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# emacs-non-dfsg is under GFDL but due to "invariant sections" is considered
+# problematic for Debian
+
+VERSION=1
+
+EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu $UPSTREAM multiverse'
+
+. ./config
+
+sed -i '/Package/s|emacs-common-non-dfsg|emacs-common-gfdl|' debian/control
+sed -i '/Section:/,/Priority:/s|non-free/editors|editors|' debian/control
+sed -i '/Description:/s|non-DFSG ||' debian/control
+sed -i '/GNU Emacs is the/,$d' debian/control
+
+changelog "Package emacs-common-gfdl for trisquel"
+
+compile