diff --git a/libraries/libesmtp/README b/libraries/libesmtp/README
index 9fd4adc144..de042ea2b9 100644
--- a/libraries/libesmtp/README
+++ b/libraries/libesmtp/README
@@ -1,5 +1,3 @@
-LibESMTP is a library for posting Electronic Mail.
-
 LibESMTP is a library to manage posting (or submission of) electronic mail
 using SMTP to a preconfigured Mail Transport Agent (MTA) such as Exim. It may
 be used as part of a Mail User Agent (MUA) or another program that must be
diff --git a/libraries/libesmtp/libesmtp.SlackBuild b/libraries/libesmtp/libesmtp.SlackBuild
index 7f680ab90c..9c011fc012 100644
--- a/libraries/libesmtp/libesmtp.SlackBuild
+++ b/libraries/libesmtp/libesmtp.SlackBuild
@@ -11,6 +11,7 @@ VERSION=1.0.4
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -20,8 +21,13 @@ DOCS="AUTHORS ChangeLog COPYING* INSTALL NEWS Notes README TODO examples"
 
 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
 
 rm -rf $PKG
@@ -37,6 +43,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --enable-static=no \
   || exit 1
 
@@ -44,8 +51,10 @@ make || exit 1
 make install DESTDIR=$PKG || exit 1
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  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
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -56,4 +65,4 @@ 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/libraries/libesmtp/libesmtp.info b/libraries/libesmtp/libesmtp.info
index 894d485758..d1cbe5cb45 100644
--- a/libraries/libesmtp/libesmtp.info
+++ b/libraries/libesmtp/libesmtp.info
@@ -2,7 +2,9 @@ PRGNAM="libesmtp"
 VERSION="1.0.4"
 HOMEPAGE="http://www.stafford.uklinux.net/libesmtp/"
 DOWNLOAD="http://www.stafford.uklinux.net/libesmtp/libesmtp-1.0.4.tar.bz2"
+DOWNLOAD_x86_64=""
 MD5SUM="8b4e8a794adc46268f0c6a0b3fb79486"
+MD5SUM_x86_64=""
 MAINTAINER="Vasilis Papavasileiou"
 EMAIL="el03020@mail.ntua.gr"
 APPROVED="rworkman"