diff --git a/system/pwsafe/pwsafe.SlackBuild b/system/pwsafe/pwsafe.SlackBuild
index f41ffe52fb..1704951e40 100644
--- a/system/pwsafe/pwsafe.SlackBuild
+++ b/system/pwsafe/pwsafe.SlackBuild
@@ -15,14 +15,15 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$APP
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
-
 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
@@ -37,40 +38,38 @@ chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 CFLAGS="$SLKCFLAGS" \
-   ./configure \
+ ./configure \
    --prefix=/usr \
+   --libdir=/usr/lib${LIBDIRSUFFIX} \
    --sysconfdir=/etc \
-   --localstatedir=/var
+   --localstatedir=/var \
+   --mandir=/usr/man \
+   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
+( 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
+   )
+
+( cd $PKG/usr/man || exit 1
+  find . -type f -exec gzip -9 {} \;
+  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz; rm $i; done
+)
+
 mkdir -p $PKG/usr/doc/$APP-$VERSION
-cp -a $DOCS $PKG/usr/doc/$APP-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+    $PKG/usr/doc/$APP-$VERSION
 cat $CWD/$APP.SlackBuild > $PKG/usr/doc/$APP-$VERSION/$APP-SlackBuild
 find $PKG/usr/doc/$APP-$VERSION -type f -exec chmod 644 {} \;
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
-( 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
-   )
-
-if [ -d $PKG/usr/man ]; then
-    ( cd $PKG/usr/man
-    find . -type f -exec gzip -9 {} \;
-    for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz; rm $i; done
-    )
-fi
-
-if [ -d $PKG/usr/info ]; then
-   rm -f $PKG/usr/info/dir
-   gzip -9 $PKG/usr/info/*.info*
-fi
-
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$APP-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$APP-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/pwsafe/pwsafe.info b/system/pwsafe/pwsafe.info
index 8c1fe7b8a9..130b4d234a 100644
--- a/system/pwsafe/pwsafe.info
+++ b/system/pwsafe/pwsafe.info
@@ -3,6 +3,8 @@ VERSION="0.2.0"
 HOMEPAGE="http://nsd.dyndns.org/pwsafe/"
 DOWNLOAD="http://nsd.dyndns.org/pwsafe/releases/pwsafe-0.2.0.tar.gz"
 MD5SUM="4bb36538a2772ecbf1a542bc7d4746c0"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Tom Fitzhenry"
 EMAIL="tom@fitzhenry.name"
 APPROVED="rworkman"