diff --git a/network/mpop/mpop.SlackBuild b/network/mpop/mpop.SlackBuild
index 78374b2d4e..629231d005 100644
--- a/network/mpop/mpop.SlackBuild
+++ b/network/mpop/mpop.SlackBuild
@@ -8,7 +8,7 @@
 
 
 PRGNAM=mpop
-VERSION=${VERSION:-1.0.13}
+VERSION=${VERSION:-1.0.18}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -20,10 +20,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -45,17 +48,21 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --infodir=/usr/info \
-  --mandir=/usr/man
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
 
 make || exit 1
 make install-strip DESTDIR=$PKG || exit 1
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 ( cd $PKG/usr/man
@@ -66,13 +73,14 @@ make install-strip DESTDIR=$PKG || exit 1
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*.info*
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/scripts/vim
 cp -a AUTHORS COPYING ChangeLog INSTALL NEWS NOTES README \
 THANKS doc/mpoprc.example $PKG/usr/doc/$PRGNAM-$VERSION
+cp scripts/vim/README scripts/vim/mpop.vim $PKG/usr/doc/$PRGNAM-$VERSION/scripts/vim
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/mpop/mpop.info b/network/mpop/mpop.info
index cc8dc9c2be..7b142d7cd8 100644
--- a/network/mpop/mpop.info
+++ b/network/mpop/mpop.info
@@ -1,8 +1,10 @@
 PRGNAM="mpop"
-VERSION="1.0.13"
+VERSION="1.0.18"
 HOMEPAGE="http://mpop.sourceforge.net/"
-DOWNLOAD="http://download.sourceforge.net/mpop/mpop-1.0.13.tar.bz2"
-MD5SUM="16453292805613078e48bd0b1aa8b657"
+DOWNLOAD="http://download.sourceforge.net/mpop/mpop-1.0.18.tar.bz2"
+DOWNLOAD_x86_64=""
+MD5SUM="d4771ffa4d7f12e40f6311df1040638d"
+MD5SUM_x86_64=""
 MAINTAINER="Marek Buras"
 EMAIL="cyfr0n@go2.pl"
-APPROVED="Erik Hanson"
+APPROVED="dsomero"
diff --git a/network/mpop/slack-desc b/network/mpop/slack-desc
index 04c0174cfb..e269a1e118 100644
--- a/network/mpop/slack-desc
+++ b/network/mpop/slack-desc
@@ -1,3 +1,10 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
     |-----handy-ruler------------------------------------------------------|
 mpop: mpop (POP3 client)
 mpop: