diff --git a/aalib/PKGBUILD b/aalib/PKGBUILD
index e76d8cb963..78758bbf93 100644
--- a/aalib/PKGBUILD
+++ b/aalib/PKGBUILD
@@ -1,34 +1,45 @@
 # POWER Maintainer: Alexander Baldeck <alex.bldck@gmail.com>
-# Maintainer: Eric Bélanger <eric@archlinux.org>
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Eric Bélanger <eric@archlinux.org>
 
 pkgname=aalib
 pkgver=1.4rc5
-pkgrel=15
-pkgdesc="A portable ASCII art graphic library"
+_pkgver=1.4.0
+pkgrel=17
+pkgdesc='ASCII art graphic library'
 arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
-url="http://aa-project.sourceforge.net/aalib/"
+url='https://aa-project.sourceforge.net/aalib/'
 license=('LGPL')
-depends=('gpm' 'libx11')
-makedepends=('libxt')
-source=(https://downloads.sourceforge.net/sourceforge/aa-project/${pkgname}-${pkgver}.tar.gz
-	aclocal-fixes.patch)
+depends=('glibc' 'gpm' 'libx11' 'ncurses' 'slang')
+optdepends=('xorg-fonts-misc: x11 driver'
+            'xorg-mkfontscale: x11 driver')
+source=("https://downloads.sourceforge.net/aa-project/$pkgname-$pkgver.tar.gz"
+        'aclocal-fixes.patch'
+        'aalib.m4.patch')
 sha256sums=('fbddda9230cf6ee2a4f5706b4b11e2190ae45f5eda1f0409dc4f99b35e0a70ee'
-            'f40742677a3e0d58c99a09da7574635411156586acd22867e71dd46c88088bce')
+            'f40742677a3e0d58c99a09da7574635411156586acd22867e71dd46c88088bce'
+            '0202545881ec34bd637c04b5896b9b3093609530cc4f85e1d5ffe9a3136d9483')
 
 prepare() {
-  cd ${pkgname}-1.4.0
-  patch -p0 -i "${srcdir}/aclocal-fixes.patch"
+  cd $pkgname-$_pkgver
 
-  autoreconf -fiv
+  # https://bugs.archlinux.org/task/78787
+  patch -Np0 -i ../aclocal-fixes.patch
+
+  # https://sourceforge.net/p/aa-project/patches/9/
+  # https://bugs.archlinux.org/task/53482
+  patch -Np0 -i ../aalib.m4.patch
+
+  autoreconf -fi
 }
 
 build() {
-  cd ${pkgname}-1.4.0
-  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
+  cd $pkgname-$_pkgver
+  ./configure --prefix=/usr --with-curses-driver
   make
 }
 
 package() {
-  cd ${pkgname}-1.4.0
-  make DESTDIR="${pkgdir}" install
+  cd $pkgname-$_pkgver
+  make DESTDIR="$pkgdir" install
 }
diff --git a/aalib/aalib.m4.patch b/aalib/aalib.m4.patch
new file mode 100644
index 0000000000..f3add79296
--- /dev/null
+++ b/aalib/aalib.m4.patch
@@ -0,0 +1,25 @@
+Index: aalib.m4
+===================================================================
+RCS file: /cvsroot/aa-project/aalib/aalib.m4,v
+retrieving revision 1.2
+diff -u -r1.2 aalib.m4
+--- aalib.m4	3 May 2001 14:56:44 -0000	1.2
++++ aalib.m4	28 Mar 2017 08:36:42 -0000
+@@ -40,14 +40,14 @@
+   if test "$AALIB_CONFIG" = "no" ; then
+     no_aalib=yes
+   else
+-    AALIB_CFLAGS=`$AALIB_CONFIG $aalibconf_args --cflags`
+-    AALIB_LIBS=`$AALIB_CONFIG $aalibconf_args --libs`
++    AALIB_CFLAGS=`$AALIB_CONFIG $aalib_args --cflags`
++    AALIB_LIBS=`$AALIB_CONFIG $aalib_args --libs`
+ 
+     aalib_major_version=`$AALIB_CONFIG $aalib_args --version | \
+            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+     aalib_minor_version=`$AALIB_CONFIG $aalib_args --version | \
+            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+-    aalib_micro_version=`$AALIB_CONFIG $aalib_config_args --version | \
++    aalib_micro_version=`$AALIB_CONFIG $aalib_args --version | \
+            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+     if test "x$enable_aalibtest" = "xyes" ; then
+       ac_save_CFLAGS="$CFLAGS"