diff --git a/audio/tuxguitar/tuxguitar.SlackBuild b/audio/tuxguitar/tuxguitar.SlackBuild
index 38cfd505ad..1b5fc10a18 100644
--- a/audio/tuxguitar/tuxguitar.SlackBuild
+++ b/audio/tuxguitar/tuxguitar.SlackBuild
@@ -1,11 +1,30 @@
 #!/bin/sh
-
+#
 # Slackware build script for TuxGuitar
-# 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=tuxguitar
 VERSION=1.1
-ARCH=x86	# Java
+ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -16,12 +35,17 @@ OUTPUT=${OUTPUT:-/tmp}
 
 set -eu
 
+case "$ARCH" in
+  i?86) BINARCH=x86 ; LIBDIRSUFFIX= ;;
+  x86_64) BINARCH=x86_64 ; LIBDIRSUFFIX=64 ;;
+esac
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION-linux-x86
-tar xvf $CWD/$PRGNAM-$VERSION-linux-x86.tar.gz
-cd $PRGNAM-$VERSION-linux-x86
+rm -rf $PRGNAM-$VERSION-linux-$BINARCH
+tar xvf $CWD/$PRGNAM-$VERSION-linux-$BINARCH.tar.gz
+cd $PRGNAM-$VERSION-linux-$BINARCH
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -38,8 +62,8 @@ install -m 0644 lib/swt.jar $PKG/usr/share/tuxguitar/swt.jar
 install -m 0644 $CWD/tuxguitar.desktop $PKG/usr/share/applications/tuxguitar.desktop
 install -m 0644 $CWD/tuxguitar.xpm $PKG/usr/share/pixmaps/tuxguitar.xpm
 
-mkdir -p $PKG/usr/lib
-install -m 0644 lib/libtuxguitar-alsa-jni.so $PKG/usr/lib/libtuxguitar-alsa-jni.so
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
+install -m 0644 lib/libtuxguitar-alsa-jni.so $PKG/usr/lib${LIBDIRSUFFIX}/libtuxguitar-alsa-jni.so
 
 mkdir -p $PKG/usr/man/man1
 install -m 0644 $CWD/tuxguitar.1.gz $PKG/usr/man/man1/tuxguitar.1.gz
@@ -53,4 +77,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 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/audio/tuxguitar/tuxguitar.info b/audio/tuxguitar/tuxguitar.info
index 66b72c7f50..9bf6aca03a 100644
--- a/audio/tuxguitar/tuxguitar.info
+++ b/audio/tuxguitar/tuxguitar.info
@@ -3,6 +3,8 @@ VERSION="1.1"
 HOMEPAGE="http://www.tuxguitar.com.ar/"
 DOWNLOAD="http://downloads.sourceforge.net/tuxguitar/tuxguitar-1.1-linux-x86.tar.gz"
 MD5SUM="9efad98f94eca0a25b4519bed5613f25"
+DOWNLOAD_x86_64="http://downloads.sourceforge.net/tuxguitar/tuxguitar-1.1-linux-x86_64.tar.gz"
+MD5SUM_x86_64="b65319e22cd87ed8b4365c5ede593d26"
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
-APPROVED="rworkman"
+APPROVED="dsomero"