diff --git a/PKGBUILD b/PKGBUILD
index cd6827c..e361a87 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,14 +4,13 @@
 _pkgbasename=ncurses
 pkgname=lib32-${_pkgbasename}
 pkgver=6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="System V Release 4.0 curses emulation library (32-bit)"
 arch=('x86_64')
-url="http://www.gnu.org/software/ncurses/"
+url="https://www.gnu.org/software/ncurses/"
 license=('MIT')
 depends=('lib32-glibc' ${_pkgbasename})
-makedepends=("gcc-multilib")
-source=(https://ftp.gnu.org/pub/gnu/ncurses/ncurses-$pkgver.tar.gz{,.sig})
+source=(https://ftp.gnu.org/pub/gnu/ncurses/ncurses-${pkgver}.tar.gz{,.sig})
 md5sums=('98c889aaf8d23910d2b92d65be2e737a'
          'SKIP')
 validpgpkeys=('C52048C0C0748FEE227D47A2702353E0F7E48EDB') # Thomas Dickey
@@ -21,39 +20,40 @@ build() {
 
   export CC="gcc -m32"
   export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
   ./configure --prefix=/usr --mandir=/usr/share/man \
      --with-pkg-config-libdir=/usr/lib32/pkgconfig \
      --with-shared --with-normal --without-debug --without-ada \
-     --with-install-prefix=${pkgdir} --enable-widec --libdir=/usr/lib32
+     --enable-widec --libdir=/usr/lib32
   make
 }
 
 package() {
   cd ${_pkgbasename}-${pkgver}
-  make install
-
-  install -dm755 ${pkgdir}/usr/lib32
+  make DESTDIR="${pkgdir}" install
 
   # fool packages looking to link to non-wide-character ncurses libraries
   for lib in curses ncurses form panel menu; do
-    rm -f ${pkgdir}/usr/lib32/lib${lib}.so
-    echo "INPUT(-l${lib}w)" >${pkgdir}/usr/lib32/lib${lib}.so
-    ln -sf lib${lib}w.a ${pkgdir}/usr/lib32/lib${lib}.a
+    echo "INPUT(-l${lib}w)" >"${pkgdir}"/usr/lib32/lib${lib}.so
+    ln -sf lib${lib}w.a "${pkgdir}"/usr/lib32/lib${lib}.a
+  done
+  ln -sf libncurses++w.a "${pkgdir}"/usr/lib32/libncurses++.a
+
+  for lib in tic tinfo; do
+    echo "INPUT(libncursesw.so.${pkgver:0:1})" > "${pkgdir}/usr/lib32/lib${lib}.so"
+    ln -s libncursesw.so.${pkgver:0:1} "${pkgdir}/usr/lib32/lib${lib}.so.${pkgver:0:1}"
   done
-  ln -sf libncurses++w.a ${pkgdir}/usr/lib32/libncurses++.a
 
   # some packages look for -lcurses during build
-  rm -f ${pkgdir}/usr/lib32/libcursesw.so
-  echo "INPUT(-lncursesw)" >${pkgdir}/usr/lib32/libcursesw.so
-  ln -sf libncurses.so ${pkgdir}/usr/lib32/libcurses.so
-  ln -sf libncursesw.a ${pkgdir}/usr/lib32/libcursesw.a
-  ln -sf libncurses.a ${pkgdir}/usr/lib32/libcurses.a
+  rm -f "${pkgdir}"/usr/lib32/libcursesw.so
+  echo "INPUT(-lncursesw)" >"${pkgdir}"/usr/lib32/libcursesw.so
+  ln -sf libncurses.so "${pkgdir}"/usr/lib32/libcurses.so
+  ln -sf libncursesw.a "${pkgdir}"/usr/lib32/libcursesw.a
+  ln -sf libncurses.a "${pkgdir}"/usr/lib32/libcurses.a
 
   rm -rf "${pkgdir}"/usr/{include,share,bin}
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
+  mkdir -p "${pkgdir}/usr/share/licenses"
+  ln -s ${_pkgbasename} "${pkgdir}/usr/share/licenses/${pkgname}"
 }
 
 # vim: set et ts=2 sw=2: