diff --git a/PKGBUILD b/PKGBUILD
index 245bc89..2e91757 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,66 @@
-# Maintainer: Mikko Seppälä <t-r-a-y@mbnet.fi>
-_pkgsourcename=ncurses
-pkgname=lib32-$_pkgsourcename
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+
+_pkgbasename=ncurses
+pkgname=lib32-${_pkgbasename}
 pkgver=5.7
-pkgrel=3
-pkgdesc="A System V Release 4.0 curses emulation library"
-url="http://www.gnu.org/software/ncurses/ncurses.html"
+pkgrel=4
+pkgdesc="System V Release 4.0 curses emulation library (32-bit)"
+arch=('x86_64')
+url="http://www.gnu.org/software/ncurses/"
 license=('MIT')
-arch=(x86_64)
-groups=('lib32')
-depends=('lib32-glibc')
-source=(ftp://ftp.archlinux.org/core/os/i686/$_pkgsourcename-$pkgver-$pkgrel-i686.pkg.tar.xz)
+depends=('lib32-glibc' ${_pkgbasename})
+makedepends=("gcc-multilib")
+source=(ftp://ftp.gnu.org/pub/gnu/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz)
+md5sums=('cce05daf61a64501ef6cd8da1f727ec6')
 
 build() {
-	cd $srcdir
-	mkdir -p $pkgdir/opt/lib32/lib
-	cp -dp lib/*.so* $pkgdir/opt/lib32/lib
+  cd ${srcdir}/
+  mkdir ncurses{,w}-build
+  
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  cd ${srcdir}/ncursesw-build
+  ../${_pkgbasename}-${pkgver}/configure --prefix=/usr --mandir=/usr/share/man \
+     --with-shared --with-normal --without-debug --without-ada \
+     --with-install-prefix=${pkgdir} --enable-widec --libdir=/usr/lib32
+  make
+
+  # libncurses.so.5 for external binary support 
+  cd ${srcdir}/ncurses-build
+#  [ $CARCH = "x86_64" ] && CONFIGFLAG="--with-chtype=long"
+  ../${_pkgbasename}-${pkgver}/configure --prefix=/usr \
+    --with-shared --with-normal --without-debug --without-ada \
+    --with-install-prefix=${pkgdir} $CONFIGFLAG --libdir=/usr/lib32
+  make
+}
+
+package() {
+  cd ${srcdir}/ncursesw-build
+  make install
+
+  install -dm755 ${pkgdir}/usr/lib32
+
+  # 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 ; \
+  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
+
+  # non-widec compatibility library
+  cd ${srcdir}/ncurses-build        
+  install -Dm755 lib/libncurses.so.${pkgver} ${pkgdir}/usr/lib32/libncurses.so.${pkgver}
 
-	mkdir -p $pkgdir/opt/lib32/usr/lib
-	cp -dp usr/lib/*.so* $pkgdir/opt/lib32/usr/lib
+  rm -rf "${pkgdir}"/usr/{include,share,bin}
 }
-md5sums=('d52d1c36c0a101a205a14c57455594d7')
-sha256sums=('73b4fe7e06333f1f38646f74f2ca9ac7ca9c5c9e4cd455f818ccd1d28bc58eb0')