diff --git a/audio/python-audiotools/doinst.sh b/audio/python-audiotools/doinst.sh
new file mode 100644
index 0000000000..ee19f823a3
--- /dev/null
+++ b/audio/python-audiotools/doinst.sh
@@ -0,0 +1,15 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/audiotools.cfg.new
+
diff --git a/audio/python-audiotools/patches/cdiomodule_header.patch b/audio/python-audiotools/patches/cdiomodule_header.patch
new file mode 100644
index 0000000000..f9de2b631e
--- /dev/null
+++ b/audio/python-audiotools/patches/cdiomodule_header.patch
@@ -0,0 +1,16 @@
+--- cdiomodule.h.orig	2015-11-09 19:48:07.220880278 -0600
++++ cdiomodule.h	2015-11-09 19:48:32.765284762 -0600
+@@ -1,11 +1,6 @@
+ #include <Python.h>
+-#ifdef OLD_PARANOIA
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
+-#else
+-#include <cdio/cdparanoia/cdda.h>
+-#include <cdio/cdparanoia/paranoia.h>
+-#endif
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ 
+ /********************************************************
+  Audio Tools, a module and set of tools for manipulating audio data
diff --git a/audio/python-audiotools/python-audiotools.SlackBuild b/audio/python-audiotools/python-audiotools.SlackBuild
index 275d3a66d0..d5c3532c25 100644
--- a/audio/python-audiotools/python-audiotools.SlackBuild
+++ b/audio/python-audiotools/python-audiotools.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for Python Audio Tools
 # Home Page: http://audiotools.sourceforge.net/
 
-# Copyright (c) 2010-2014, Nishant Limbachia, Hoffman Estates, IL, USA
+# Copyright (c) 2010-2016, Nishant Limbachia, Hoffman Estates, IL, USA
 # <nishant _AT_ mnspace _DOT_ net>
 # All rights reserved.
 
@@ -26,15 +26,15 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM="python-audiotools"
-VERSION=${VERSION:-2.22}
+VERSION=${VERSION:-3.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCNAM="$(printf $PRGNAM | cut -f2 -d-)"
+SRCNAM="audiotools"
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -45,8 +45,8 @@ 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"
@@ -73,8 +73,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Fix for libcdio-0.9 and libcdio-paranoia-10.2+0.93 (-current)
-sed -i -e 's:#include <cdio/:#include <cdio/paranoia/:' src/cdiomodule.h
+( cd src; patch -p0 < $CWD/patches/cdiomodule_header.patch )
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/audio/python-audiotools/python-audiotools.info b/audio/python-audiotools/python-audiotools.info
index d45bdfffd6..a19a0d2ef2 100644
--- a/audio/python-audiotools/python-audiotools.info
+++ b/audio/python-audiotools/python-audiotools.info
@@ -1,8 +1,8 @@
 PRGNAM="python-audiotools"
-VERSION="2.22"
+VERSION="3.1.1"
 HOMEPAGE="http://audiotools.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/audiotools/audiotools-2.22.tar.gz"
-MD5SUM="8e373a6c8caf4d55bcd501c5ab6ea555"
+DOWNLOAD="http://downloads.sourceforge.net/audiotools/audiotools-3.1.1.tar.gz"
+MD5SUM="08c52afbdfd41f18d068c525bcf93e42"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""