diff --git a/libraries/libetpan/libetpan.SlackBuild b/libraries/libetpan/libetpan.SlackBuild
index d8a607da94..913b5fb3e1 100644
--- a/libraries/libetpan/libetpan.SlackBuild
+++ b/libraries/libetpan/libetpan.SlackBuild
@@ -1,10 +1,29 @@
 #!/bin/sh
-
+#
 # Slackware build script for libetpan
-# Written by Erik Hanson  erik@slackbuilds.org
+#
+# Copyright 2009  Erik W. Hanson, Minneapolis, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libetpan
-VERSION=0.57
+VERSION=0.58
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -58,4 +77,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/libetpan/libetpan.info b/libraries/libetpan/libetpan.info
index 730849d9a7..6b1adfbec9 100644
--- a/libraries/libetpan/libetpan.info
+++ b/libraries/libetpan/libetpan.info
@@ -1,8 +1,10 @@
 PRGNAM="libetpan"
-VERSION="0.57"
+VERSION="0.58"
 HOMEPAGE="http://www.etpan.org/"
-DOWNLOAD="http://downloads.sourceforge.net/libetpan/libetpan-0.57.tar.gz"
-MD5SUM="8ce8c6c071e81884a475b12b7f9a9cc0"
+DOWNLOAD="http://downloads.sourceforge.net/libetpan/libetpan-0.58.tar.gz"
+MD5SUM="bf20b5c0548f06b94bc588afdf5b3436"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
 APPROVED="rworkman"