diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index 5b8fce922d2..bce1afae024 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,26 +1,36 @@
 # Template file for 'opera'
 pkgname=opera
-version=35.0.2066.37
+version=36.0.2130.65
 revision=1
-only_for_archs="x86_64"
+only_for_archs="i686 x86_64"
 depends="ffmpeg desktop-file-utils"
 short_desc="Fast, secure, easy to use browser"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="Proprietary"
 repository="nonfree"
 homepage="http://www.opera.com/browser/"
-distfiles="http://get.geo.opera.com/pub/opera/desktop/${version}/linux/opera-stable_${version}_amd64.deb"
-checksum=3afa543f51d5f7fe4e8fbff93518c4afe0a0a8fab5e43210fbc0f6d42739d148
+
+if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ];then
+	_debarch=amd64
+	_platform=x86_64
+	checksum=f6fd496f3cafcb5d12540b9b3ee7ec5fc2d8f3ccfd525d3bb537cc3020efaa31
+else
+	_debarch=i386
+	_platform=i386
+	checksum=81077245e55d893d47a5aa911c29d8f29d7794e0314bc9e1f8ea383bcd8aab8a
+fi
+
+distfiles="http://get.geo.opera.com/pub/opera/desktop/${version}/linux/opera-stable_${version}_${_debarch}.deb"
 
 do_extract() {
-	ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/opera-stable_${version}_amd64.deb
+	ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/opera-stable_${version}_${_debarch}.deb
 	cd ${wrksrc}
 	tar xfJ data.tar.xz
 }
 
 do_install() {
 	vbin ${FILESDIR}/opera
-	vcopy usr/lib/x86_64-linux-gnu usr/lib
+	vcopy usr/lib/${_platform}-linux-gnu usr/lib
 	vcopy usr/share /usr/share
 	vlicense usr/share/doc/opera-stable/copyright
 }