diff --git a/network/remmina/README b/network/remmina/README
index 2a57015484..91a78f4416 100644
--- a/network/remmina/README
+++ b/network/remmina/README
@@ -1,8 +1,8 @@
-Remmina is a remote desktop client written in GTK+, aiming to be 
-useful for system administrators and travellers, who need to work 
-with lots of remote computers in front of either large monitors or 
-tiny netbooks. Remmina supports multiple network protocols in an 
-integrated and consistant user interface. Currently RDP, VNC, NX, 
+Remmina is a remote desktop client written in GTK+, aiming to be
+useful for system administrators and travellers, who need to work
+with lots of remote computers in front of either large monitors or
+tiny netbooks. Remmina supports multiple network protocols in an
+integrated and consistant user interface. Currently RDP, VNC, NX,
 XDMCP and SSH are supported.
 
 Optional support for extra features can be enabled with some switches:
diff --git a/network/remmina/remmina.SlackBuild b/network/remmina/remmina.SlackBuild
index 5dc5faf43f..94e4e67f62 100644
--- a/network/remmina/remmina.SlackBuild
+++ b/network/remmina/remmina.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2013 Luis Henrique
 # Copyright 2013 Niels Horn, Rio de Janeiro, RJ, Brazil
-# Copyright 2015-2016 Philip van der Hoeven, Almere, The Netherlands
+# Copyright 2015-2018 Philip van der Hoeven, Almere, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,19 +25,19 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=remmina
-VERSION=${VERSION:-next20160509}
+VERSION=${VERSION:-next20180405}
+COMMIT=${COMMIT:-71cb7a156065d65d7b5465596ab9bc5aeb8b84ec}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCNAM=Remmina
-TARVERSION=next
+DIRNAME=Remmina-$COMMIT
 
 AVAHI=${AVAHI:-OFF}
 TELEPATHY=${TELEPATHY:-OFF}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -48,8 +48,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"
@@ -67,9 +67,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$TARVERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $SRCNAM-$TARVERSION
+rm -rf $DIRNAME
+tar xvf $CWD/$COMMIT.tar.gz
+cd $DIRNAME
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -86,21 +86,21 @@ cd build
     -DWITH_AVAHI=${AVAHI} \
     -DWITH_TELEPATHY=${TELEPATHY} \
     -DWITH_VTE=ON \
-    -DWITH_SURVEY=OFF \
     -DWITH_APPINDICATOR=OFF \
     -DCMAKE_BUILD_TYPE=Release ..
-
   make VERBOSE=1
   make install DESTDIR=$PKG
 cd ..
 
-# make install forgot these
-mkdir -p $PKG/usr/include/remmina
-cp -a remmina/include/remmina/*.h $PKG/usr/include/remmina
-
 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
 
+# Move manpages in their proper place.
+mv $PKG/usr/share/man $PKG/usr/
+
+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 AUTHORS ChangeLog README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/network/remmina/remmina.info b/network/remmina/remmina.info
index ab0d526b31..1cbdb73025 100644
--- a/network/remmina/remmina.info
+++ b/network/remmina/remmina.info
@@ -1,10 +1,10 @@
 PRGNAM="remmina"
-VERSION="next20160509"
+VERSION="next20180405"
 HOMEPAGE="http://www.remmina.org"
-DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/remmina/remmina-next20160509.tar.gz"
-MD5SUM="b5b36564ee4354c9dd3022a7cc3fcac3"
+DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/remmina/71cb7a156065d65d7b5465596ab9bc5aeb8b84ec.tar.gz"
+MD5SUM="c0bc8160d9a6804f088b543d47f8822e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="freerdp vte3"
+REQUIRES="freerdp vte3 json-glib spice-protocol spice-gtk"
 MAINTAINER="Philip van der Hoeven"
 EMAIL="philip@vd-hoeven.nl"