diff --git a/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch b/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
new file mode 100644
index 00000000000..b5f2360685f
--- /dev/null
+++ b/srcpkgs/gnupg/patches/sys-siglist-and-no-systemd.patch
@@ -0,0 +1,16 @@
+No brainer patch converted from 
+	vsed -i 's/HAVE_DECL_SYS_SIGLIST/0/' common/signal.c
+
+Index: gnupg-2.2.28/common/signal.c
+===================================================================
+--- gnupg-2.2.28.orig/common/signal.c
++++ gnupg-2.2.28/common/signal.c
+@@ -87,7 +87,7 @@ get_signal_name( int signum )
+ {
+   /* Note that we can't use strsignal(), because it is not
+      reentrant. */
+-#if HAVE_DECL_SYS_SIGLIST && defined(NSIG)
++#if 0 && defined(NSIG)
+   return (signum >= 0 && signum < NSIG) ? sys_siglist[signum] : "?";
+ #else
+   return NULL;
diff --git a/srcpkgs/gnupg2/patches/use-versioned-pcsclite.patch b/srcpkgs/gnupg/patches/use-versioned-pcsclite.patch
similarity index 100%
rename from srcpkgs/gnupg2/patches/use-versioned-pcsclite.patch
rename to srcpkgs/gnupg/patches/use-versioned-pcsclite.patch
diff --git a/srcpkgs/gnupg2/template b/srcpkgs/gnupg/template
similarity index 61%
rename from srcpkgs/gnupg2/template
rename to srcpkgs/gnupg/template
index 36fba35e68b..436d206a217 100644
--- a/srcpkgs/gnupg2/template
+++ b/srcpkgs/gnupg/template
@@ -1,15 +1,14 @@
-# Template file for 'gnupg2'
-pkgname=gnupg2
+# Template file for 'gnupg'
+pkgname=gnupg
 version=2.2.28
-revision=1
-wrksrc="gnupg-${version}"
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gpg-is-gpg2 $(vopt_enable ldap)
+configure_args="$(vopt_enable ldap)
  --with-libgcrypt-prefix=${XBPS_CROSS_BASE}/usr
  --with-libassuan-prefix=${XBPS_CROSS_BASE}/usr
  --with-ksba-prefix=${XBPS_CROSS_BASE}/usr
  --with-npth-prefix=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config gettext"
 makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel
  libksba-devel libldap-devel libusb-compat-devel npth-devel sqlite-devel
  libgcrypt-devel"
@@ -23,20 +22,25 @@ checksum=6ff891fc7583a9c3fb9f097ee0d1de0a12469d4b53997e7ba5064950637dfaec
 build_options="ldap"
 build_options_default="ldap"
 
-post_patch() {
-	# On at least aarch64, configure sets this even though it doesn't exist
-	vsed -i 's/HAVE_DECL_SYS_SIGLIST/0/' common/signal.c
-	vsed -i '/examples\/systemd-user/d' doc/Makefile.in
+post_install() {
+	vmkdir usr/share/examples
+	rm -r $DESTDIR/usr/share/doc/gnupg/examples/systemd-user
+	mv ${DESTDIR}/usr/share/doc/gnupg/examples \
+		${DESTDIR}/usr/share/examples/gnupg
 }
 
-post_install() {
-	# remove conflicts with gnupg 1.
-	mv ${DESTDIR}/usr/share/man/man7/gnupg.7 ${DESTDIR}/usr/share/man/man7/gnupg2.7
-
-	vmkdir usr/share/examples
-	mv ${DESTDIR}/usr/share/doc/gnupg/examples ${DESTDIR}/usr/share/examples/gnupg2
-
-	mv ${DESTDIR}/usr/share/doc/gnupg ${DESTDIR}/usr/share/doc/gnupg2
+gnupg2_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - compat package"
+	pkg_install() {
+		vmkdir usr/bin
+		ln -s gpg $PKGDESTDIR/usr/bin/gpg2
+		ln -s gpgv $PKGDESTDIR/usr/bin/gpgv2
+		vmkdir usr/share/examples
+		ln -s gnupg $PKGDESTDIR/usr/share/examples/gnupg2
+		vmkdir usr/share/doc
+		ln -s gnupg $PKGDESTDIR/usr/share/doc/gnupg2
+	}
 }
 
 gnupg2-scdaemon_package() {
diff --git a/srcpkgs/gnupg2 b/srcpkgs/gnupg2
new file mode 120000
index 00000000000..ce3d705284c
--- /dev/null
+++ b/srcpkgs/gnupg2
@@ -0,0 +1 @@
+gnupg
\ No newline at end of file
diff --git a/srcpkgs/gnupg2-scdaemon b/srcpkgs/gnupg2-scdaemon
index 7a41d0a790f..ce3d705284c 120000
--- a/srcpkgs/gnupg2-scdaemon
+++ b/srcpkgs/gnupg2-scdaemon
@@ -1 +1 @@
-gnupg2
\ No newline at end of file
+gnupg
\ No newline at end of file
diff --git a/srcpkgs/gnupg2/update b/srcpkgs/gnupg2/update
deleted file mode 100644
index 95f92483c02..00000000000
--- a/srcpkgs/gnupg2/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=gnupg