diff --git a/pinentry/1.0.0-libiconv.patch b/pinentry/1.0.0-libiconv.patch
new file mode 100644
index 00000000..f62aadbb
--- /dev/null
+++ b/pinentry/1.0.0-libiconv.patch
@@ -0,0 +1,11 @@
+--- origsrc/pinentry-1.0.0/w32/Makefile.am	2016-04-14 09:39:51.000000000 -0500
++++ src/pinentry-1.0.0/w32/Makefile.am	2017-06-29 02:06:33.906651400 -0500
+@@ -35,7 +35,7 @@ pinentry_w32_SOURCES = main.c pinentry-w
+ pinentry_w32_LDFLAGS = -mwindows
+ pinentry_w32_LDADD = pinentry-w32.o \
+ 	../pinentry/libpinentry.a ../secmem/libsecmem.a \
+-        $(COMMON_LIBS)
++        $(COMMON_LIBS) $(LIBICONV)
+ 
+ pinentry-w32.o: pinentry-w32.rc resource.h $(logos)
+ 	$(WINDRES) -I.. -v -o $@ $<
diff --git a/pinentry/1.1.0-w32.patch b/pinentry/1.1.0-w32.patch
new file mode 100644
index 00000000..f5a8bdae
--- /dev/null
+++ b/pinentry/1.1.0-w32.patch
@@ -0,0 +1,37 @@
+diff -ru pinentry-1.1.0-orig/configure.ac pinentry-1.1.0/configure.ac
+--- pinentry-1.1.0-orig/configure.ac	2017-12-03 17:49:54.000000000 +0100
++++ pinentry-1.1.0/configure.ac	2018-06-21 22:44:58.560006300 +0200
+@@ -576,7 +576,7 @@
+ # Check whether we should build the W32 pinentry.  This is actually
+ # the simplest check as we do this only for that platform.
+ #
+-pinentry_w32=no
++pinentry_w32=yes
+ test $have_w32_system = yes && pinentry_w32=yes
+ AM_CONDITIONAL(BUILD_PINENTRY_W32, test "$pinentry_w32" = "yes")
+ 
+diff -ru pinentry-1.1.0-orig/w32/main.c pinentry-1.1.0/w32/main.c
+--- pinentry-1.1.0-orig/w32/main.c	2017-12-03 17:13:05.000000000 +0100
++++ pinentry-1.1.0/w32/main.c	2018-06-21 22:44:34.529631800 +0200
+@@ -19,6 +19,7 @@
+ #include <config.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #if WINVER < 0x0403
+ # define WINVER 0x0403  /* Required for SendInput.  */
+ #endif
+diff -ru pinentry-1.1.0-orig/w32/pinentry-w32.rc pinentry-1.1.0/w32/pinentry-w32.rc
+--- pinentry-1.1.0-orig/w32/pinentry-w32.rc	2017-12-03 17:13:05.000000000 +0100
++++ pinentry-1.1.0/w32/pinentry-w32.rc	2018-06-21 22:46:08.010978600 +0200
+@@ -63,8 +63,8 @@
+     RTEXT           "", IDC_PINENT_PROMPT, 6,  60,  60, 12
+     EDITTEXT        IDC_PINENT_TEXT,      70,  59, 110, 12, ES_PASSWORD | ES_AUTOHSCROLL
+     CTEXT           "", IDC_PINENT_ERR,    6,  76, 174, 12
+-    DEFPUSHBUTTON   "O&K", IDOK,          74,  96,  50, 14
+-    PUSHBUTTON      "&Cancel", IDCANCEL, 130,  96,  50, 14
++    DEFPUSHBUTTON   "O&K", IDOK,          10,  96,  80, 14
++    PUSHBUTTON      "&Cancel", IDCANCEL,  96,  96,  80, 14
+ END
+ 
+ 
diff --git a/pinentry/PKGBUILD b/pinentry/PKGBUILD
index bbc09652..da6007ad 100644
--- a/pinentry/PKGBUILD
+++ b/pinentry/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname=pinentry
-pkgver=0.9.7
-pkgrel=3
+pkgver=1.1.0
+pkgrel=1
 pkgdesc='A collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol'
 url='https://gnupg.org/related_software/pinentry/'
 license=('GPL')
@@ -10,11 +10,15 @@ arch=('i686' 'x86_64')
 makedepends=('ncurses-devel' 'libassuan-devel' 'libgpg-error-devel')
 depends=('ncurses' 'libassuan' 'libgpg-error')
 source=(https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
-        pinentry-0.9.1-msysize.patch)
+        pinentry-0.9.1-msysize.patch
+        1.1.0-w32.patch
+        1.0.0-libiconv.patch)
 install=pinentry.install
-sha256sums=('6398208394972bbf897c3325780195584682a0d0c164ca5a0da35b93b1e4e7b2'
+sha256sums=('68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570'
             'SKIP'
-            '346cf3d9245c87151fd6e3dd88c9f5d4cb47a627cb36cab2d0d993338a0e5a75')
+            '346cf3d9245c87151fd6e3dd88c9f5d4cb47a627cb36cab2d0d993338a0e5a75'
+            '859afced15eff0ddf5268521eabeedc4f60d2d8bee4419cea4da8fdcb68e7a89'
+            '7723a10cfc9f8a711b118ad9bd06e96c2acb9860f91b635b1253588c2a42811c')
 validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6') # Werner Koch
 
 install=${pkgname}.install
@@ -22,7 +26,8 @@ install=${pkgname}.install
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p1 -i ${srcdir}/pinentry-0.9.1-msysize.patch
-  
+  patch -p1 -i ${srcdir}/1.1.0-w32.patch
+  patch -p2 -i ${srcdir}/1.0.0-libiconv.patch
   ./autogen.sh
 }
 
@@ -31,10 +36,13 @@ build() {
   ./configure \
     --build=${CHOST} \
     --prefix=/usr \
-    --enable-pinentry-curses \
+    --disable-pinentry-tty \
+    --disable-fallback-curses \
+    --disable-pinentry-curses \
     --disable-pinentry-gtk2 \
-    --disable-pinentry-qt4 \
-    --enable-fallback-curses
+    --disable-pinentry-qt \
+    --disable-libsecret \
+    --without-libcap
 
   make
 }