diff --git a/network/vivaldi/README b/network/vivaldi/README
index bcb75575c6..6654f9bad4 100644
--- a/network/vivaldi/README
+++ b/network/vivaldi/README
@@ -3,7 +3,4 @@ vivaldi (web browser).
 A Browser for Our Friends. An advanced browser made with the power user
 in mind. Finally you can surf your way.
 
-pepperflash-plugin, ffmpeg, vivaldi-codecs-ffmpeg-extra are optional
-dependencies.
-
 Vivaldi for ARM can be downloaded at https://vivaldi.com/download/
diff --git a/network/vivaldi/doinst.sh b/network/vivaldi/doinst.sh
index 65c7e2eeb9..1a8085ae10 100644
--- a/network/vivaldi/doinst.sh
+++ b/network/vivaldi/doinst.sh
@@ -7,3 +7,6 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
     /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
+
+rm -f /opt/vivaldi/libffmpeg.so
+rm -f /opt/vivaldi/libwidevinecdm.so
diff --git a/network/vivaldi/vivaldi.SlackBuild b/network/vivaldi/vivaldi.SlackBuild
index 9590668581..5c9321f236 100644
--- a/network/vivaldi/vivaldi.SlackBuild
+++ b/network/vivaldi/vivaldi.SlackBuild
@@ -24,7 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=vivaldi
-VERSION=${VERSION:-2.8.1664.44}
+VERSION=${VERSION:-2.9.1705.31}
+FFMPEG_VERSION="77.0.3865.90"
 WIDEVINE_VERSION="4.10.1440.18"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -38,8 +39,8 @@ if [ -z "$ARCH" ]; then
 fi
 
 case "$ARCH" in
-    i?86) BITS="i386" ; WIDEVINE_BITS="ia32" ;;
-  x86_64) BITS="amd64" ; WIDEVINE_BITS="x64" ;;
+    i?86) BITS="i386" ; WBITS="ia32" ; PBITS="x86" ;;
+  x86_64) BITS="amd64" ; WBITS="x64" ; PBITS="x64" ;;
     arm*) BITS="armhf" ;;
        *) echo "$ARCH is not supported."
           exit 1 ;;
@@ -58,11 +59,19 @@ mkdir -p $TMP/$PRGNAM $PKG $OUTPUT
 cd $TMP/$PRGNAM
 ar p $CWD/${PRGNAM}-stable_${VERSION}-*_${BITS}.deb data.tar.xz | tar xvJ
 if [ "x$BITS" = "xarmhf" ] ; then
-  echo "This script does not support Widevine on ARM."
+  echo "This script doesn't support installing proprietary media codecs on ARM."
 else
-  unzip -oq $CWD/${WIDEVINE_VERSION}-linux-${WIDEVINE_BITS}.zip \
-    libwidevinecdm.so -d opt/vivaldi
+  mkdir -p var/opt/vivaldi/WidevineCdm/_platform_specific/linux_${PBITS}
+  mkdir -p var/opt/vivaldi/media-codecs-${FFMPEG_VERSION}
+  ar p $CWD/chromium-codecs-ffmpeg-extra_${FFMPEG_VERSION}-*_${BITS}.deb \
+    data.tar.xz | tar xJf - ./usr/lib/chromium-browser/libffmpeg.so --strip 4
+  mv libffmpeg.so var/opt/vivaldi/media-codecs-${FFMPEG_VERSION}
+  unzip -oq $CWD/${WIDEVINE_VERSION}-linux-${WBITS}.zip \
+    -d var/opt/vivaldi/WidevineCdm
+  mv var/opt/vivaldi/WidevineCdm/libwidevinecdm.so \
+    var/opt/vivaldi/WidevineCdm/_platform_specific/linux_${PBITS}
 fi
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -71,12 +80,14 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 rm -r opt/vivaldi/cron
-mv opt usr $PKG/
+rm -f opt/vivaldi/WidevineCdm
+mv opt usr var $PKG/
 
 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
 
 ln -sf /opt/vivaldi/vivaldi $PKG/usr/bin/vivaldi
+ln -fs /var/opt/vivaldi/WidevineCdm $PKG/opt/vivaldi/WidevineCdm
 
 for res in 16 22 24 32 48 64 128 256; do
    install -Dm644 "$PKG/opt/vivaldi/product_logo_${res}.png" \
diff --git a/network/vivaldi/vivaldi.info b/network/vivaldi/vivaldi.info
index 79dd58aaea..32b522093e 100644
--- a/network/vivaldi/vivaldi.info
+++ b/network/vivaldi/vivaldi.info
@@ -1,13 +1,17 @@
 PRGNAM="vivaldi"
-VERSION="2.8.1664.44"
+VERSION="2.9.1705.31"
 HOMEPAGE="https://vivaldi.com"
-DOWNLOAD="https://downloads.vivaldi.com/stable/vivaldi-stable_2.8.1664.44-1_i386.deb \
+DOWNLOAD="https://downloads.vivaldi.com/stable/vivaldi-stable_2.9.1705.31-1_i386.deb \
+          http://launchpadlibrarian.net/443538022/chromium-codecs-ffmpeg-extra_77.0.3865.90-0ubuntu0.16.04.1_i386.deb \
           https://dl.google.com/widevine-cdm/4.10.1440.18-linux-ia32.zip"
-MD5SUM="8fba052ed67f9efa4b64be1bbc144b5b \
+MD5SUM="416132e9478cbd44fedb736dad983f4e \
+        02dad7608bfebddffd60e707386c4232 \
         c151f6314712678ac81b6298bc36c997"
-DOWNLOAD_x86_64="https://downloads.vivaldi.com/stable/vivaldi-stable_2.8.1664.44-1_amd64.deb \
+DOWNLOAD_x86_64="https://downloads.vivaldi.com/stable/vivaldi-stable_2.9.1705.31-1_amd64.deb \
+                 http://launchpadlibrarian.net/443497930/chromium-codecs-ffmpeg-extra_77.0.3865.90-0ubuntu0.16.04.1_amd64.deb \
                  https://dl.google.com/widevine-cdm/4.10.1440.18-linux-x64.zip"
-MD5SUM_x86_64="1e80609ef6c527044c83bd1485a2e490 \
+MD5SUM_x86_64="b6900b68446882fda2799aa7636ebecf \
+               be72ea71a96b400f6b824cb103b05dc8 \
                fc6cf66cdff7c57d367b317505f086d1"
 REQUIRES=""
 MAINTAINER="Alexander Verbovetsky"