diff --git a/games/oolite/doinst.sh b/games/oolite/doinst.sh
index 2472345872..63fb67213e 100644
--- a/games/oolite/doinst.sh
+++ b/games/oolite/doinst.sh
@@ -4,4 +4,4 @@ if [ -x /usr/bin/update-mime-database ]; then
 fi
 if [ -x /usr/bin/update-desktop-database ]; then
     /usr/bin/update-desktop-database -q usr/share/applications
-fi 
+fi
diff --git a/games/oolite/oolite.SlackBuild b/games/oolite/oolite.SlackBuild
index f57b9aee21..9002397162 100644
--- a/games/oolite/oolite.SlackBuild
+++ b/games/oolite/oolite.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for oolite
 
-# Copyright 2016  Johannes Schoepfer, Herrenberg, BW, Germany
+# Copyright 2016 - 2018 Johannes Schoepfer, Germany
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=oolite
-VERSION=${VERSION:-1.84}
+VERSION=${VERSION:-1.86}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -38,10 +38,10 @@ fi
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}	
+OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i586"
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -71,35 +71,40 @@ find -L . \
 
 source /usr/share/GNUstep/Makefiles/GNUstep.sh
 export GNUSTEP_MAKEFILES=/usr/share/GNUstep/Makefiles
-sed -i "/ADDITIONAL_OBJSLKFLAGS/s/=/= -fobjc-exceptions ${SLKFLAGS}/" GNUmakefile
-make -f libjs.make debug=no 
-make -f Makefile ESPEAK=yes release-deployment 
+sed -i "/ADDITIONAL_OBJSLKFLAGS/s/=/= -fobjc-exceptions ${SLKCFLAGS}/" GNUmakefile
+make -f libjs.make debug=no
+make -f Makefile ESPEAK=yes release-deployment
 
 mkdir -p $PKG/usr/share/oolite
-mv oolite.app/* $PKG/usr/share/oolite/
-
-#install startscript
-mkdir $PKG/usr/bin
-cat << EOF > $PKG/usr/bin/oolite
-#!/bin/sh
-
-# Start oolite
-
-cd /usr/share/oolite
-./oolite
-EOF
-chmod 755 $PKG/usr/bin/oolite
-
-# icon
-install -D -m644 installers/FreeDesktop/oolite-icon.png $PKG/usr/share/pixmaps/oolite-icon.png
-# .desktop file
-install -D -m644 installers/FreeDesktop/oolite.desktop $PKG/usr/share/applications/oolite.desktop
-# documentation
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-install -D -m644 Doc/AdviceForNewCommanders.pdf Doc/OoliteReadMe.pdf Doc/OoliteRS.pdf $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a oolite.app/* $PKG/usr/share/oolite/
 
 find $PKG -type f -exec file {} + | fgrep -e "executable" -e "shared object" | fgrep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+mkdir $PKG/usr/games
+cat << 'EOF' > $PKG/usr/games/oolite
+#!/bin/bash
+source /usr/share/GNUstep/Makefiles/GNUstep.sh
+[ ! -d ~/.Oolite/AddOns ] && mkdir -p ~/.Oolite/AddOns
+[ ! -d ~/GNUstep/Library/ApplicationSupport/Oolite/ManagedAddOns ] && \
+  mkdir -p ~/GNUstep/Library/ApplicationSupport/Oolite/ManagedAddOns
+/usr/share/oolite/oolite "$@"
+EOF
+chmod 755 $PKG/usr/games/oolite
+
+cp installers/FreeDesktop/oolite-icon.png $PKG/usr/share/pixmaps
+cp installers/FreeDesktop/oolite.desktop $PKG/usr/share/applications
+
+mkdir -p $PKG/usr/man/man6
+cp debian/oolite.6 $PKG/usr/man/man6
+find $PKG/usr/man -type f -exec gzip -9 {} +
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  Doc/{*.txt,*.TXT,*.pdf} \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
 mkdir -p $PKG/install
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/games/oolite/oolite.info b/games/oolite/oolite.info
index 011786cf38..9dec980896 100644
--- a/games/oolite/oolite.info
+++ b/games/oolite/oolite.info
@@ -1,8 +1,8 @@
 PRGNAM="oolite"
-VERSION="1.84"
+VERSION="1.86"
 HOMEPAGE="http://www.oolite.org/"
-DOWNLOAD="https://github.com/OoliteProject/oolite/releases/download/1.84/oolite-source-1.84.tar.bz2"
-MD5SUM="538e4249dbf4d3418216e0bdb7cbf408"
+DOWNLOAD="https://github.com/OoliteProject/oolite/releases/download/1.86/oolite-source-1.86.tar.bz2"
+MD5SUM="2f6f565f3db65c102a5923ded659af8e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="espeak gnustep-base OpenAL"