diff --git a/pinentry/PKGBUILD b/pinentry/PKGBUILD
index 3ca07fde..f1ee2636 100644
--- a/pinentry/PKGBUILD
+++ b/pinentry/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=pinentry
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 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,22 +10,17 @@ arch=('i686' 'x86_64')
 makedepends=('ncurses-devel' 'libassuan-devel' 'libgpg-error-devel' 'autotools' 'gcc')
 depends=('ncurses' 'libassuan' 'libgpg-error')
 source=(https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
-        pinentry-0.9.1-msysize.patch
         1.1.0-w32.patch
         1.0.0-libiconv.patch)
 sha256sums=('10072045a3e043d0581f91cd5676fcac7ffee957a16636adedaa4f583a616470'
             'SKIP'
-            '346cf3d9245c87151fd6e3dd88c9f5d4cb47a627cb36cab2d0d993338a0e5a75'
             '0222e625b39f2acd75e718d65ee4eb86f90766cd36e26b9460676766738bc93d'
             '7723a10cfc9f8a711b118ad9bd06e96c2acb9860f91b635b1253588c2a42811c')
 validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' # Werner Koch (dist sig)
               '6DAA6E64A76D2840571B4902528897B826403ADA') # Werner Koch (dist signing 2020)
 
-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
@@ -33,8 +28,10 @@ prepare() {
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CHOST} \
+    --build=${CYGWIN_CHOST} \
     --prefix=/usr \
     --disable-pinentry-tty \
     --disable-fallback-curses \
diff --git a/pinentry/pinentry-0.9.1-msysize.patch b/pinentry/pinentry-0.9.1-msysize.patch
deleted file mode 100644
index acc39334..00000000
--- a/pinentry/pinentry-0.9.1-msysize.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -Naur pinentry-0.9.1-orig/build-aux/config.guess pinentry-0.9.1/build-aux/config.guess
---- pinentry-0.9.1-orig/build-aux/config.guess	2015-03-18 13:38:54.000000000 +0300
-+++ pinentry-0.9.1/build-aux/config.guess	2015-05-02 10:51:40.813200000 +0300
-@@ -867,6 +867,9 @@
-     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
- 	exit ;;
-+    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	echo x86_64-unknown-msys
-+	exit ;;
-     p*:CYGWIN*:*)
- 	echo powerpcle-unknown-cygwin
- 	exit ;;
-diff -Naur pinentry-0.9.1-orig/build-aux/config.rpath pinentry-0.9.1/build-aux/config.rpath
---- pinentry-0.9.1-orig/build-aux/config.rpath	2015-03-18 13:39:29.000000000 +0300
-+++ pinentry-0.9.1/build-aux/config.rpath	2015-05-02 10:51:14.106000000 +0300
-@@ -57,7 +57,7 @@
-     aix*)
-       wl='-Wl,'
-       ;;
--    mingw* | cygwin* | pw32* | os2* | cegcc*)
-+    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
-       ;;
-     hpux9* | hpux10* | hpux11*)
-       wl='-Wl,'
-@@ -149,7 +149,7 @@
- hardcode_minus_L=no
- 
- case "$host_os" in
--  cygwin* | mingw* | pw32* | cegcc*)
-+  cygwin* | msys* | mingw* | pw32* | cegcc*)
-     # FIXME: the MSVC++ port hasn't been tested in a loooong time
-     # When not using gcc, we currently assume that we are using
-     # Microsoft Visual C++.
-@@ -198,7 +198,7 @@
-         ld_shlibs=no
-       fi
-       ;;
--    cygwin* | mingw* | pw32* | cegcc*)
-+    cygwin* | msys* | mingw* | pw32* | cegcc*)
-       # hardcode_libdir_flag_spec is actually meaningless, as there is
-       # no search path for DLLs.
-       hardcode_libdir_flag_spec='-L$libdir'
-@@ -348,7 +348,7 @@
-       ;;
-     bsdi[45]*)
-       ;;
--    cygwin* | mingw* | pw32* | cegcc*)
-+    cygwin* | msys* | mingw* | pw32* | cegcc*)
-       # When not using gcc, we currently assume that we are using
-       # Microsoft Visual C++.
-       # hardcode_libdir_flag_spec is actually meaningless, as there is
-@@ -537,7 +537,7 @@
-   bsdi[45]*)
-     library_names_spec='$libname$shrext'
-     ;;
--  cygwin* | mingw* | pw32* | cegcc*)
-+  cygwin* | msys* | mingw* | pw32* | cegcc*)
-     shrext=.dll
-     library_names_spec='$libname.dll.a $libname.lib'
-     ;;
-diff -Naur pinentry-0.9.1-orig/pinentry/pinentry-curses.c pinentry-0.9.1/pinentry/pinentry-curses.c
---- pinentry-0.9.1-orig/pinentry/pinentry-curses.c	2015-03-18 14:02:08.000000000 +0300
-+++ pinentry-0.9.1/pinentry/pinentry-curses.c	2015-05-02 10:52:54.760400000 +0300
-@@ -22,7 +22,7 @@
- #include <config.h>
- #endif
- #include <assert.h>
--#include <curses.h>
-+#include <ncurses/curses.h>
- #include <signal.h>
- #include <fcntl.h>
- #include <unistd.h>
diff --git a/pinentry/pinentry.install b/pinentry/pinentry.install
deleted file mode 100644
index fddb1e76..00000000
--- a/pinentry/pinentry.install
+++ /dev/null
@@ -1,20 +0,0 @@
-info_dir=usr/share/info
-info_files="pinentry.info"
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files}; do
-    usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in $info_files; do
-    usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}