diff --git a/srcpkgs/vivaldi/REMOVE b/srcpkgs/vivaldi/REMOVE
new file mode 100644
index 00000000000..739d6bfc5e0
--- /dev/null
+++ b/srcpkgs/vivaldi/REMOVE
@@ -0,0 +1,9 @@
+#
+# After removing /opt/vivaldi, xbps removes /opt if empty!
+# This script restores /opt
+#
+case "$ACTION" in
+post)
+	mkdir -p /opt
+	;;
+esac
diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index f3cbd793064..43e83eb2c0e 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,38 +1,42 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=1.12.955.36
+version=1.12.955.38
 revision=1
 _release=1
 only_for_archs="i686 x86_64"
+depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Advanced browser made with the power user in mind"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="Proprietary"
 homepage="https://vivaldi.com"
 repository="nonfree"
 restricted=yes
-nopie=yes
+nostrip=yes
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	_debarch=amd64
-	checksum=12775223bfd916d8792dfbfa4d5cd5985def263ab6eb9e1ce5de6fec17d9063a
+	checksum=1c3fb2c2ecac7a9d54a641fbbe59743b85de6ffc896b600bcf26dfb98dd601af
 else
 	_debarch=i386
-	checksum=5f5e378f9911eb61e805a0da3d612c968fdb7ac21470d32e768a54739265de4d
+	checksum=489ddb25d0854bfd1604d051860fba2c5d555f0b32c4f0d4a21a00728c7ab111
 fi
 
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_${_debarch}.deb"
 
 do_extract() {
 	ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/vivaldi-stable_${version}-${_release}_${_debarch}.deb
-	tar xf data.tar.xz
+	tar xf data.tar.xz --exclude={./etc,./opt/vivaldi/cron,./usr/share/{doc,gnome-control-center,menu}}
 }
 
 do_install() {
+	vinstall usr/share/applications/vivaldi-stable.desktop 0644 \
+		/usr/share/applications
+
 	vcopy opt/ /opt
 	vcopy usr /
-	for res in 24 48 64; do
+
+	for res in 16 22 24 32 48 64 128 256; do
 		vinstall opt/vivaldi/product_logo_${res}.png 0644 \
 		/usr/share/icons/hicolor/${res}x${res}/apps vivaldi.png
 	done
-	ln -sf /opt/vivaldi/vivaldi ${DESTDIR}/usr/bin/vivaldi-stable
 }