diff --git a/srcpkgs/pinentry-gtk b/srcpkgs/pinentry-gtk
new file mode 120000
index 00000000000..ca6c20e3c67
--- /dev/null
+++ b/srcpkgs/pinentry-gtk
@@ -0,0 +1 @@
+pinentry
\ No newline at end of file
diff --git a/srcpkgs/pinentry/INSTALL b/srcpkgs/pinentry/INSTALL
new file mode 100644
index 00000000000..76418ee5dce
--- /dev/null
+++ b/srcpkgs/pinentry/INSTALL
@@ -0,0 +1,5 @@
+case ${ACTION} in
+post)
+	ln -sf pinentry-curses usr/bin/pinentry
+	;;
+esac
diff --git a/srcpkgs/pinentry/REMOVE b/srcpkgs/pinentry/REMOVE
new file mode 100644
index 00000000000..f2cbad58024
--- /dev/null
+++ b/srcpkgs/pinentry/REMOVE
@@ -0,0 +1,5 @@
+case ${ACTION} in
+purge)
+	rm -f usr/bin/pinentry
+	;;
+esac
diff --git a/srcpkgs/pinentry/pinentry-gtk.INSTALL b/srcpkgs/pinentry/pinentry-gtk.INSTALL
new file mode 100644
index 00000000000..b6b6458aaf6
--- /dev/null
+++ b/srcpkgs/pinentry/pinentry-gtk.INSTALL
@@ -0,0 +1,5 @@
+case ${ACTION} in
+post)
+	ln -sf pinentry-gtk-2 usr/bin/pinentry
+	;;
+esac
diff --git a/srcpkgs/pinentry/pinentry-gtk.REMOVE b/srcpkgs/pinentry/pinentry-gtk.REMOVE
new file mode 100644
index 00000000000..21fe61014c3
--- /dev/null
+++ b/srcpkgs/pinentry/pinentry-gtk.REMOVE
@@ -0,0 +1,6 @@
+case ${ACTION} in
+purge)
+	rm -f usr/bin/pinentry
+	[ -f usr/bin/pinentry-curses ] && ln -sf pinentry-curses usr/bin/pinentry
+	;;
+esac
diff --git a/srcpkgs/pinentry/template b/srcpkgs/pinentry/template
new file mode 100644
index 00000000000..b6756fc1b06
--- /dev/null
+++ b/srcpkgs/pinentry/template
@@ -0,0 +1,27 @@
+# Template file for 'pinentry'
+pkgname=pinentry
+version=0.8.4
+revision=1
+build_style=gnu-configure
+configure_args="--disable-rpath --without-libcap --disable-pinentry-gtk
+	--enable-pinentry-curses --enable-fallback-curses --enable-pinentry-gtk2"
+hostmakedepends="pkg-config"
+makedepends="ncurses-devel gtk+-devel"
+short_desc="PIN or passphrase entry dialogs for GnuPG"
+maintainer="Eivind Uggedal <eivind@uggedal.com>"
+license="GPL-2"
+homepage="https://www.gnupg.org/related_software/pinentry/index.html"
+distfiles="ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${version}.tar.bz2"
+checksum=359db3bf46cb743ba0b3aeef259f6107271ca888ba3e22c1cba525c9aca35612
+
+post_install() {
+	rm ${DESTDIR}/usr/bin/pinentry
+}
+
+pinentry-gtk_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" based on GTK+"
+	pkg_install() {
+		vmove usr/bin/pinentry-gtk-2
+	}
+}