diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
new file mode 100644
index 00000000000..c2f236a5d3b
--- /dev/null
+++ b/srcpkgs/vivaldi/template
@@ -0,0 +1,37 @@
+# Template file for 'vivaldi'
+pkgname=vivaldi
+version=1.0.344.37
+revision=1
+_release=1
+only_for_archs="i686 x86_64"
+short_desc="An 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
+
+if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ];then
+	_debarch=amd64
+	checksum=f23c4616446e6b1b3e4f532fb336d3d586974ee2fe46ada17be65d23216817be
+else
+	_debarch=i386
+	checksum=04755b7feb3ed03eb4f4d0dd52ef713a22479fb412bedeadc31087ea42e3234e
+fi
+
+distfiles="https://vivaldi.com/download/stable/vivaldi-beta_${version}-${_release}_${_debarch}.deb"
+
+do_extract() {
+	ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/vivaldi-beta_${version}-${_release}_${_debarch}.deb
+	cd ${wrksrc}
+	tar xfJ data.tar.xz
+}
+
+do_install() {
+	vcopy opt/ /opt
+	vcopy usr /
+	for res in 24 48 64; do
+		vinstall opt/vivaldi-beta/product_logo_${res}.png 0644\
+		/usr/share/icons/hicolor/${res}x${res}/apps/vivaldi.png
+	done
+}