diff --git a/gengetopt/PKGBUILD b/gengetopt/PKGBUILD
index 31535cb34cd..ebb9c4bf0b7 100644
--- a/gengetopt/PKGBUILD
+++ b/gengetopt/PKGBUILD
@@ -2,31 +2,31 @@
 
 pkgname=gengetopt
 pkgver=2.23
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool to write command line option parsing code for C programs"
 arch=('i686' 'x86_64' 'arm' 'armv6h')
 url="https://www.gnu.org/software/gengetopt/gengetopt.html"
 license=("GPL")
 options=('!docs' '!makeflags')
 makedepends=('bison' 'flex' 'gcc' 'help2man' 'autotools')
-source=(https://ftp.gnu.org/gnu/gengetopt/${pkgname}-${pkgver}.tar.xz{,.sig}
-        msysize.patch)
+source=(https://ftp.gnu.org/gnu/gengetopt/${pkgname}-${pkgver}.tar.xz{,.sig})
 sha256sums=('b941aec9011864978dd7fdeb052b1943535824169d2aa2b0e7eae9ab807584ac'
-            'SKIP'
-            '803fade65b7a266ef511687a9b79a938a59ef7c9e649a2e794701a5dd592e56d')
+            'SKIP')
 validpgpkeys=('CD7AB2B200F374043F92E5D42485C3A5CF0FF62F')
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p1 -i ${srcdir}/msysize.patch
+
   autoreconf -fiv
 }
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
+    --build=${CYGWIN_CHOST} \
     --disable-dependency-tracking
 
   make
diff --git a/gengetopt/msysize.patch b/gengetopt/msysize.patch
deleted file mode 100644
index 51950206245..00000000000
--- a/gengetopt/msysize.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur gengetopt-2.22.6-orig/build-aux/config.guess gengetopt-2.22.6/build-aux/config.guess
---- gengetopt-2.22.6-orig/build-aux/config.guess	2012-11-02 17:28:51.000000000 +0400
-+++ gengetopt-2.22.6/build-aux/config.guess	2014-07-18 00:44:23.362400000 +0400
-@@ -844,6 +844,9 @@
-     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
- 	exit ;;
-+    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	echo x86_64-unknown-msys
-+	exit ;;
-     prep*:SunOS:5.*:*)
- 	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
- 	exit ;;
\ No newline at end of file