diff --git a/mingw-w64-gettext/PKGBUILD b/mingw-w64-gettext/PKGBUILD
index 14e6e65076..b69475793e 100644
--- a/mingw-w64-gettext/PKGBUILD
+++ b/mingw-w64-gettext/PKGBUILD
@@ -6,9 +6,11 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.19.4
 pkgrel=3
 arch=('any')
-groups=("${MINGW_PACKAGE_PREFIX}")
 pkgdesc="GNU internationalization library (mingw-w64)"
-depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-libiconv") # "${MINGW_PACKAGE_PREFIX}-termcap"
+depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
+         "${MINGW_PACKAGE_PREFIX}-libiconv"
+         #"${MINGW_PACKAGE_PREFIX}-termcap"
+         )
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-ncurses")
 options=('strip' 'staticlibs')
 
@@ -16,7 +18,7 @@ options=('strip' 'staticlibs')
 license=(GPL3 partial:'LGPL2.1')
 
 url="http://www.gnu.org/software/gettext/"
-source=("http://ftp.gnu.org/pub/gnu/${_realname}/${_realname}-$pkgver.tar.gz"{,.sig}
+source=("http://ftp.gnu.org/pub/gnu/${_realname}/${_realname}-${pkgver}.tar.gz"{,.sig}
         00-relocatex-libintl-0.18.3.1.patch
         120-Fix-Woe32-link-errors-when-compiling-with-O0.patch
         04-mingw-script-slash-fix.mingw.patch
@@ -35,7 +37,7 @@ md5sums=('d3511af1e604a3478900d2c2b4a4a48e'
          'f5b611172ae58f1e4589a8d0c1d53414')
 
 prepare() {
-  cd "$srcdir/${_realname}-$pkgver"
+  cd "${srcdir}/${_realname}-$pkgver"
   rm -rf gettext-runtime/intl/canonicalize.c \
          gettext-runtime/intl/relocatex.c \
          gettext-runtime/intl/relocatex.h \
@@ -53,11 +55,12 @@ prepare() {
   #WANT_AUTOMAKE=latest ./autogen.sh --skip-gnulib
 }
 
-build()
-{
-  mkdir -p $srcdir/build-${MINGW_CHOST} && cd $srcdir/build-${MINGW_CHOST}
-  # export lt_cv_deplibs_check_method='pass_all'
-  ${srcdir}/${_realname}-$pkgver/configure \
+build() {
+  export lt_cv_deplibs_check_method='pass_all'
+  
+  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
+  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+  ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --host=${MINGW_CHOST} \
     --target=${MINGW_CHOST} \
@@ -76,12 +79,13 @@ build()
     --with-included-libxml \
     --with-included-glib \
     --with-libncurses-prefix=${MINGW_PREFIX}
+
   make
 }
 
 package() {
-  cd $srcdir/build-${MINGW_CHOST}
-  make DESTDIR="$pkgdir" install
+  cd ${srcdir}/build-${MINGW_CHOST}
+  make DESTDIR="${pkgdir}" install
 
   # Licenses
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING"                                 "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"