diff --git a/gnupg/gnupg.spec b/gnupg/gnupg.spec
index bc8e4b1b11..9d13632340 100644
--- a/gnupg/gnupg.spec
+++ b/gnupg/gnupg.spec
@@ -32,7 +32,7 @@ Class:        PLUS
 Group:        PGP
 License:      GPL
 Version:      2.1.11
-Release:      20160305
+Release:      20160306
 
 #   package options
 %option       with_setuid yes
@@ -44,8 +44,8 @@ Source0:      ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
 Patch0:       gnupg.patch
 
 #   build information
-BuildPreReq:  OpenPKG, openpkg >= 20100101, make
-PreReq:       OpenPKG, openpkg >= 20100101, pinentry
+BuildPreReq:  OpenPKG, openpkg >= 20160101, make
+PreReq:       OpenPKG, openpkg >= 20160101, pinentry
 BuildPreReq:  gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 2.0.0, gpg-error >= 1.11
 PreReq:       gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 2.0.0, gpg-error >= 1.11
 BuildPreReq:  zlib, bzip2, readline, npth, libiconv
@@ -75,7 +75,7 @@ PreReq:       openldap, openssl
     }
 
 %prep
-    %setup -q -n gnupg-%{version}
+    %setup -q
     %patch -p0
     %{l_shtool} subst \
         -e 's;PRINTABLE_OS_NAME;"%{l_openpkg_release}";g' \
@@ -95,9 +95,9 @@ PreReq:       openldap, openssl
 %if "%{with_curl}" == "yes"
     LIBS="$LIBS -lz"
 %endif
-    LIBS="$LIBS -liconv"
+    LIBS="$LIBS -liconv `npth-config --libs`"
     export CC="%{l_cc}"
-    export CFLAGS="%{l_cflags -O}"
+    export CFLAGS="%{l_cflags -O} `npth-config --cflags`"
     export CPPFLAGS="%{l_cppflags}"
     export LDFLAGS="%{l_ldflags}"
     ./configure \