diff --git a/app-crypt/pinentry-base/Manifest b/app-crypt/pinentry-base/Manifest
index f015e9ec6..6186093ed 100644
--- a/app-crypt/pinentry-base/Manifest
+++ b/app-crypt/pinentry-base/Manifest
@@ -1 +1 @@
-DIST pinentry-0.8.2.tar.bz2 428514 SHA256 5084b7b6aac5725303f3b0185f126daa8b33ee78ade538edf1e20034594a39b1 SHA512 f012ed163b8905e10714e8667a4434eb192e9519e0fa91a686b097224252bf2e73c3b35d682b6fd4a9df80eefcb3afbf2ec763aef58a3ab5a1e71268fd83e158 WHIRLPOOL 0a17bf30390895dddbaad14bcf07b3064fb7e3c1ed97ba22231e13201f24cfc194a8ef110da7316f137ed3942c094c1990aa51a80b352c5572748b42f40a77d7
+DIST pinentry-0.8.3.tar.bz2 430753 SHA256 568b0b09b50b2388a4f94d704d5bcb28718ecd4654ed1acc43ab1f97d921a0ad SHA512 942aad8db63d5e2f7b576ef6286edf6ce5fdb7c2a0a82deb864fa22963b183dd12a235f12277a6dade9d914b5e76302f1ab35ae78b0f595e84fff77d8f417a18 WHIRLPOOL 0d0e905b79eb6d7727f1de57be058b3c3885b577124cb1fdebca4e0b81d085070f1953b307b506a602de4055bdca6886e7f56e17b5d6978e161eaedf170785e2
diff --git a/app-crypt/pinentry-base/files/pinentry-0.8.2-ncurses.patch b/app-crypt/pinentry-base/files/pinentry-0.8.2-ncurses.patch
new file mode 100644
index 000000000..3bb92c63d
--- /dev/null
+++ b/app-crypt/pinentry-base/files/pinentry-0.8.2-ncurses.patch
@@ -0,0 +1,25 @@
+From bafe8608fc525ef103b3d1f3048ca28958bef596 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sun, 5 May 2013 02:23:08 +0300
+Subject: [PATCH] ncurses: link with optional tinfo
+
+---
+ m4/curses.m4 | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/m4/curses.m4 b/m4/curses.m4
+index 3a01881..ffb6bd1 100644
+--- a/m4/curses.m4
++++ b/m4/curses.m4
+@@ -36,6 +36,8 @@ AC_DEFUN([IU_LIB_NCURSES], [
+       have_ncursesw=no
+     fi
+     if test "$LIBNCURSES"; then
++      AC_CHECK_LIB(tinfow, curs_set, LIBNCURSES="${LIBNCURSES} -ltinfow",
++        AC_CHECK_LIB(tinfo, curs_set, LIBNCURSES="${LIBNCURSES} -ltinfo"))
+       # Use ncurses header files instead of the ordinary ones, if possible;
+       # is there a better way of doing this, that avoids looking in specific
+       # directories?
+-- 
+1.8.1.5
+
diff --git a/app-crypt/pinentry-base/files/pinentry-0.8.2-texi.patch b/app-crypt/pinentry-base/files/pinentry-0.8.2-texi.patch
new file mode 100644
index 000000000..f036fa93a
--- /dev/null
+++ b/app-crypt/pinentry-base/files/pinentry-0.8.2-texi.patch
@@ -0,0 +1,20 @@
+--- doc/gpl.texi	2013-06-09 10:50:53.990704797 +1200
++++ doc/gpl.texi	2013-06-09 10:51:25.310432565 +1200
+@@ -12,7 +12,7 @@
+ of this license document, but changing it is not allowed.
+ @end display
+ 
+-@appendixsubsec Preamble
++@appendixsec Preamble
+ 
+   The licenses for most software are designed to take away your
+ freedom to share and change it.  By contrast, the GNU General Public
+@@ -63,7 +63,7 @@
+ modification follow.
+ 
+ @iftex
+-@appendixsubsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
++@appendixsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+ @end iftex
+ @ifinfo
+ @center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
diff --git a/app-crypt/pinentry-base/pinentry-base-0.8.2.ebuild b/app-crypt/pinentry-base/pinentry-base-0.8.3.ebuild
similarity index 79%
rename from app-crypt/pinentry-base/pinentry-base-0.8.2.ebuild
rename to app-crypt/pinentry-base/pinentry-base-0.8.3.ebuild
index 0483677e8..1b8a7b100 100644
--- a/app-crypt/pinentry-base/pinentry-base-0.8.2.ebuild
+++ b/app-crypt/pinentry-base/pinentry-base-0.8.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=5
 
-inherit eutils flag-o-matic
+inherit autotools multilib eutils flag-o-matic
 
 MY_PN=${PN/-base}
 MY_P=${P/-base}
@@ -22,6 +22,7 @@ RDEPEND="
 	caps? ( sys-libs/libcap )
 	sys-libs/ncurses
 	static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] )
+	ppc-aix? ( dev-libs/gnulib )
 "
 DEPEND="${RDEPEND}"
 
@@ -29,9 +30,22 @@ S=${WORKDIR}/${MY_P}
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
 
+src_prepare() {
+	epatch "${FILESDIR}/${MY_PN}-0.8.2-ncurses.patch"
+	epatch "${FILESDIR}/${MY_PN}-0.8.2-texi.patch"
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+	eautoreconf
+}
+
 src_configure() {
 	use static && append-ldflags -static
 
+	if [[ ${CHOST} == *-aix* ]] ; then
+		append-flags -I"${EPREFIX}/usr/$(get_libdir)/gnulib/include"
+		append-ldflags -L"${EPREFIX}/usr/$(get_libdir)/gnulib/$(get_libdir)"
+		append-libs -lgnu
+	fi
+
 	econf \
 		--disable-dependency-tracking \
 		--enable-maintainer-mode \
diff --git a/app-crypt/pinentry-gtk2/Manifest b/app-crypt/pinentry-gtk2/Manifest
index f015e9ec6..6186093ed 100644
--- a/app-crypt/pinentry-gtk2/Manifest
+++ b/app-crypt/pinentry-gtk2/Manifest
@@ -1 +1 @@
-DIST pinentry-0.8.2.tar.bz2 428514 SHA256 5084b7b6aac5725303f3b0185f126daa8b33ee78ade538edf1e20034594a39b1 SHA512 f012ed163b8905e10714e8667a4434eb192e9519e0fa91a686b097224252bf2e73c3b35d682b6fd4a9df80eefcb3afbf2ec763aef58a3ab5a1e71268fd83e158 WHIRLPOOL 0a17bf30390895dddbaad14bcf07b3064fb7e3c1ed97ba22231e13201f24cfc194a8ef110da7316f137ed3942c094c1990aa51a80b352c5572748b42f40a77d7
+DIST pinentry-0.8.3.tar.bz2 430753 SHA256 568b0b09b50b2388a4f94d704d5bcb28718ecd4654ed1acc43ab1f97d921a0ad SHA512 942aad8db63d5e2f7b576ef6286edf6ce5fdb7c2a0a82deb864fa22963b183dd12a235f12277a6dade9d914b5e76302f1ab35ae78b0f595e84fff77d8f417a18 WHIRLPOOL 0d0e905b79eb6d7727f1de57be058b3c3885b577124cb1fdebca4e0b81d085070f1953b307b506a602de4055bdca6886e7f56e17b5d6978e161eaedf170785e2
diff --git a/app-crypt/pinentry-gtk2/pinentry-gtk2-0.8.2.ebuild b/app-crypt/pinentry-gtk2/pinentry-gtk2-0.8.3.ebuild
similarity index 96%
rename from app-crypt/pinentry-gtk2/pinentry-gtk2-0.8.2.ebuild
rename to app-crypt/pinentry-gtk2/pinentry-gtk2-0.8.3.ebuild
index 151c1c1be..cca57789a 100644
--- a/app-crypt/pinentry-gtk2/pinentry-gtk2-0.8.2.ebuild
+++ b/app-crypt/pinentry-gtk2/pinentry-gtk2-0.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
diff --git a/app-crypt/pinentry-qt4/Manifest b/app-crypt/pinentry-qt4/Manifest
index f015e9ec6..6186093ed 100644
--- a/app-crypt/pinentry-qt4/Manifest
+++ b/app-crypt/pinentry-qt4/Manifest
@@ -1 +1 @@
-DIST pinentry-0.8.2.tar.bz2 428514 SHA256 5084b7b6aac5725303f3b0185f126daa8b33ee78ade538edf1e20034594a39b1 SHA512 f012ed163b8905e10714e8667a4434eb192e9519e0fa91a686b097224252bf2e73c3b35d682b6fd4a9df80eefcb3afbf2ec763aef58a3ab5a1e71268fd83e158 WHIRLPOOL 0a17bf30390895dddbaad14bcf07b3064fb7e3c1ed97ba22231e13201f24cfc194a8ef110da7316f137ed3942c094c1990aa51a80b352c5572748b42f40a77d7
+DIST pinentry-0.8.3.tar.bz2 430753 SHA256 568b0b09b50b2388a4f94d704d5bcb28718ecd4654ed1acc43ab1f97d921a0ad SHA512 942aad8db63d5e2f7b576ef6286edf6ce5fdb7c2a0a82deb864fa22963b183dd12a235f12277a6dade9d914b5e76302f1ab35ae78b0f595e84fff77d8f417a18 WHIRLPOOL 0d0e905b79eb6d7727f1de57be058b3c3885b577124cb1fdebca4e0b81d085070f1953b307b506a602de4055bdca6886e7f56e17b5d6978e161eaedf170785e2
diff --git a/app-crypt/pinentry-qt4/pinentry-qt4-0.8.2.ebuild b/app-crypt/pinentry-qt4/pinentry-qt4-0.8.3.ebuild
similarity index 97%
rename from app-crypt/pinentry-qt4/pinentry-qt4-0.8.2.ebuild
rename to app-crypt/pinentry-qt4/pinentry-qt4-0.8.3.ebuild
index 33a7860b1..1826fb671 100644
--- a/app-crypt/pinentry-qt4/pinentry-qt4-0.8.2.ebuild
+++ b/app-crypt/pinentry-qt4/pinentry-qt4-0.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
diff --git a/app-crypt/pinentry/pinentry-0.8.2.ebuild b/app-crypt/pinentry/pinentry-0.8.3.ebuild
similarity index 94%
rename from app-crypt/pinentry/pinentry-0.8.2.ebuild
rename to app-crypt/pinentry/pinentry-0.8.3.ebuild
index 217b9a2de..258cfd587 100644
--- a/app-crypt/pinentry/pinentry-0.8.2.ebuild
+++ b/app-crypt/pinentry/pinentry-0.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $