diff --git a/system/multitail/multitail.SlackBuild b/system/multitail/multitail.SlackBuild
index 96bba08a86..5a0a566432 100644
--- a/system/multitail/multitail.SlackBuild
+++ b/system/multitail/multitail.SlackBuild
@@ -2,7 +2,8 @@
 
 # Slackware build script for MultiTail
 
-# Copyright 2009-2012  Erik W. Hanson, Minneapolis, MN, USA
+# Copyright 2009-2015  Erik W. Hanson, Minneapolis, MN, USA
+# Copyright 2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=multitail
-VERSION=${VERSION:-5.2.13}
+VERSION=${VERSION:-6.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,10 +62,14 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Fix our destination
 sed -i "s|/usr/share|/usr|" Makefile
+sed -i "s|share/man/man1|man/man1|" Makefile
+sed -i "s|share/doc|doc|" Makefile
+sed -i 's|ncursesw/panel.h|panel.h|' mt.h
+sed -i 's|ncursesw/ncurses.h|ncurses.h|' mt.h
 
 # Create a landing pad
 mkdir -p $PKG/usr/{bin,doc,man/man1} $PKG/etc $PKG/install
@@ -74,6 +79,10 @@ CFLAGS="$SLKCFLAGS" make
 make install DESTDIR=$PKG
 strip --strip-unneeded $PKG/usr/bin/multitail
 
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/system/multitail/multitail.info b/system/multitail/multitail.info
index 642db5ddf7..f0132fe368 100644
--- a/system/multitail/multitail.info
+++ b/system/multitail/multitail.info
@@ -1,10 +1,10 @@
 PRGNAM="multitail"
-VERSION="5.2.13"
+VERSION="6.4.1"
 HOMEPAGE="http://www.vanheusden.com/multitail/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/multitail-5.2.13.tgz"
-MD5SUM="71a774b6d6bb430672c8a9252baac6e6"
+DOWNLOAD="http://www.vanheusden.com/multitail/multitail-6.4.1.tgz"
+MD5SUM="e82a32f090d61665524b1e866d7d57ca"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Erik Hanson"
-EMAIL="erik@slackbuilds.org"
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"