diff --git a/gis/rasterio/rasterio.SlackBuild b/gis/rasterio/rasterio.SlackBuild
index 3f39a35f94..9fdeec50f9 100644
--- a/gis/rasterio/rasterio.SlackBuild
+++ b/gis/rasterio/rasterio.SlackBuild
@@ -2,7 +2,7 @@
 
 # SlackBuild script for rasterio
 
-# Copyright 2013 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2013-2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -31,7 +31,7 @@ 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,8 +42,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"
@@ -62,22 +62,27 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
-  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
-  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+if $(python3 -c 'import sys' 2>/dev/null); then
+  python3 setup.py install --root=$PKG
+fi
 python setup.py install --root=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS.txt CHANGES.txt LICENSE.txt README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS.txt CHANGES.txt LICENSE.txt 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/gis/rasterio/rasterio.info b/gis/rasterio/rasterio.info
index d0a3dfb85b..9fc3d047b6 100644
--- a/gis/rasterio/rasterio.info
+++ b/gis/rasterio/rasterio.info
@@ -1,7 +1,7 @@
 PRGNAM="rasterio"
 VERSION="0.36.0"
 HOMEPAGE="https://github.com/mapbox/rasterio"
-DOWNLOAD="https://github.com/mapbox/rasterio/archive/0.36.0.tar.gz"
+DOWNLOAD="https://github.com/mapbox/rasterio/archive/0.36.0/rasterio-0.36.0.tar.gz"
 MD5SUM="864120a9d85c5f8efae518e085b8f71a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""