diff --git a/development/asm6809/asm6809.SlackBuild b/development/asm6809/asm6809.SlackBuild
index 844d054933..1d3cb6a6e8 100644
--- a/development/asm6809/asm6809.SlackBuild
+++ b/development/asm6809/asm6809.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for asm6809
 
-# Copyright 2015  David Golus <bassplayer69@gmail.com>
+# Copyright 2016-2018  David Golus <bassplayer69@gmail.com>
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -21,17 +21,14 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Heavily based on original slackbuild by AlienBOB.
-# Modified by David Golus <bassplayer69@gmail.com>
-
 PRGNAM=asm6809
-VERSION=${VERSION:-2.9.1}
+VERSION=${VERSION:-2.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -42,15 +39,14 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  SLKLDFLAGS="-L/usr/lib64"
   LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
@@ -72,17 +68,15 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-LDFLAGS="-lm" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --sysconfdir=/etc \
-  --enable-static=no \
   --build=$ARCH-slackware-linux
 
 make
@@ -97,7 +91,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ChangeLog COPYING.GPL README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \;
+# find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \;
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/development/asm6809/asm6809.info b/development/asm6809/asm6809.info
index 20995b6ef7..024c1df966 100644
--- a/development/asm6809/asm6809.info
+++ b/development/asm6809/asm6809.info
@@ -1,8 +1,8 @@
 PRGNAM="asm6809"
-VERSION="2.9.1"
+VERSION="2.11"
 HOMEPAGE="http://www.6809.org.uk/asm6809/"
-DOWNLOAD="http://www.6809.org.uk/asm6809/dl/asm6809-2.9.1.tar.gz"
-MD5SUM="9e48a8e9e50307dd042eb008b65e0a84"
+DOWNLOAD="http://www.6809.org.uk/asm6809/dl/asm6809-2.11.tar.gz"
+MD5SUM="67eca54a83b0acdb6dcb2be802beb99f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""