diff --git a/heimdal/PKGBUILD b/heimdal/PKGBUILD
index 90b5cb82..a29e328c 100644
--- a/heimdal/PKGBUILD
+++ b/heimdal/PKGBUILD
@@ -3,7 +3,7 @@
 pkgbase=heimdal
 pkgname=('heimdal' 'heimdal-libs' 'heimdal-devel')
 pkgver=7.7.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Implementation of Kerberos V5 libraries"
 arch=('i686' 'x86_64')
 url="https://www.h5l.org/"
@@ -51,10 +51,11 @@ prepare() {
 build() {
   cd ${srcdir}/heimdal-${pkgver}
 
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
-    --build=${CHOST} \
-    --host=${CHOST} \
-    --target=${CHOST} \
+    --build=${CYGWIN_CHOST} \
+    --host=${CYGWIN_CHOST} \
+    --target=${CYGWIN_CHOST} \
     --prefix=/usr \
     --libexecdir=/usr/libexec \
     --sbindir=/usr/bin \