diff --git a/libraries/decorator/decorator.info b/libraries/decorator/decorator.info
deleted file mode 100644
index dcd028f0a9..0000000000
--- a/libraries/decorator/decorator.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="decorator"
-VERSION="3.4.0"
-HOMEPAGE="http://pypi.python.org/pypi/decorator"
-DOWNLOAD="http://pypi.python.org/packages/source/d/decorator/decorator-3.4.0.tar.gz"
-MD5SUM="1e8756f719d746e2fc0dd28b41251356"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Mikko Värri"
-EMAIL="vmj@linuxbox.fi"
diff --git a/libraries/decorator/README b/python/decorator/README
similarity index 79%
rename from libraries/decorator/README
rename to python/decorator/README
index d1d2a840af..ff2bfc793c 100644
--- a/libraries/decorator/README
+++ b/python/decorator/README
@@ -2,3 +2,5 @@ The aim of the decorator module it to simplify the usage of decorators
 for the average programmer, and to popularize decorators usage giving
 examples of useful decorators, such as memoize, tracing,
 redirecting_stdout, locked, etc.
+
+Python 3 support will be included if python3 is installed.
diff --git a/libraries/decorator/decorator.SlackBuild b/python/decorator/decorator.SlackBuild
similarity index 87%
rename from libraries/decorator/decorator.SlackBuild
rename to python/decorator/decorator.SlackBuild
index 8545f3b70c..ccb77a0a76 100644
--- a/libraries/decorator/decorator.SlackBuild
+++ b/python/decorator/decorator.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for decorator
 
 # Copyright 2013 Mikko Värri, Finland
+# Copyright 2017 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +24,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=decorator
-VERSION=${VERSION:-3.4.0}
+VERSION=${VERSION:-4.0.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
@@ -57,8 +58,13 @@ find -L . \
 
 python setup.py install --root=$PKG
 
+# Python 3 support.
+if $(python3 -c 'import sys' 2>/dev/null); then
+  python3 setup.py install --root=$PKG
+fi
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.txt documentation* $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a CHANGES.md LICENSE.txt docs/README.rst $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/python/decorator/decorator.info b/python/decorator/decorator.info
new file mode 100644
index 0000000000..45966980d0
--- /dev/null
+++ b/python/decorator/decorator.info
@@ -0,0 +1,10 @@
+PRGNAM="decorator"
+VERSION="4.0.11"
+HOMEPAGE="http://pypi.python.org/pypi/decorator"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/d/decorator/decorator-4.0.11.tar.gz"
+MD5SUM="73644c8f0bd4983d1b6a34b49adec0ae"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Benjamin Trigona-Harany"
+EMAIL="slackbuilds@jaxartes.net"
diff --git a/libraries/decorator/slack-desc b/python/decorator/slack-desc
similarity index 100%
rename from libraries/decorator/slack-desc
rename to python/decorator/slack-desc