diff --git a/srcpkgs/whatsdesk-bin-i686/template b/srcpkgs/whatsdesk-bin-i686/template
deleted file mode 100644
index 56e854c..0000000
--- a/srcpkgs/whatsdesk-bin-i686/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'whatsdesk-bin-i686'
-pkgname=whatsdesk-bin-i686
-version=0.3.8
-revision=1
-archs="i686"
-hostmakedepends="bsdtar"
-wrksrc=whatsdesk-bin
-create_wrksrc=yes
-depends="libXScrnSaver nss libXtst libnotify libappindicator"
-short_desc="Unofficial client for WhatsApp"
-maintainer="Kevin F. <https://github.com/KF-Art>"
-license="MIT"
-conflicts="whatsdesk-git"
-homepage="https://gitlab.com/zerkc/whatsdesk"
-distfiles="https://zerkc.gitlab.io/whatsdesk/whatsdesk_${version}_i386.deb
-           ${homepage}/-/raw/master/LICENSE"
-checksum="3f551646fd5a9fcc8b37cbe157c0a92284e0e3d01013f13728e5362c7ac24e82
- 38f8c3d94c9497be761fc95f10d3c530a693bae33fa89d5ce29fe1fac45e3aea"
-
-do_extract() {
-    cd ${wrksrc}
-    ar xv ${XBPS_SRCDISTDIR}/${pkgname}-${version}/whatsdesk_${version}_i386.deb
-}
-
-do_install() {
-	bsdtar -xv -C ${DESTDIR} -f data.tar.xz
-	vmkdir usr/bin
-	ln -sf "/opt/whatsdesk/whatsdesk" "${DESTDIR}/usr/bin/"
-        sed -i 's/MimeType=.*/ /g' ${DESTDIR}/usr/share/applications/whatsdesk.desktop
-        sed -i 's/Name=.*/Name=Whatsdesk/g' ${DESTDIR}/usr/share/applications/whatsdesk.desktop
-	vlicense ${XBPS_SRCDISTDIR}/${pkgname}-${version}/LICENSE
-}
diff --git a/srcpkgs/whatsdesk-bin/template b/srcpkgs/whatsdesk-bin/template
index 894a344..e8ec2b2 100644
--- a/srcpkgs/whatsdesk-bin/template
+++ b/srcpkgs/whatsdesk-bin/template
@@ -1,8 +1,8 @@
 # Template file for 'whatsdesk-bin'
 pkgname=whatsdesk-bin
-version=0.3.8
+version=0.3.9
 revision=1
-archs="x86_64"
+archs="x86_64 i686"
 hostmakedepends="bsdtar"
 wrksrc=whatsdesk-bin
 create_wrksrc=yes
@@ -13,14 +13,25 @@ maintainer="Kevin F. <https://github.com/KF-Art>"
 license="MIT"
 homepage="https://gitlab.com/zerkc/whatsdesk"
 conflicts="whatsdesk-git"
-distfiles="https://zerkc.gitlab.io/whatsdesk/whatsdesk_${version}_amd64.deb
+
+
+if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+	_debarch=amd64
+	checksum="02b1b2902fe835ac1f34fc0d24ed793f6d312ef12e44066de83ebbfd39b06486
+38f8c3d94c9497be761fc95f10d3c530a693bae33fa89d5ce29fe1fac45e3aea"
+else
+    broken="For some bug in WhatsDesk website, 32bit binary is not available yet. Template will be updated when they fix this."
+	# _debarch=i386
+	# checksum="3f551646fd5a9fcc8b37cbe157c0a92284e0e3d01013f13728e5362c7ac24e82
+    # 38f8c3d94c9497be761fc95f10d3c530a693bae33fa89d5ce29fe1fac45e3aea"
+fi
+
+distfiles="https://zerkc.gitlab.io/whatsdesk/whatsdesk_${version}_${_debarch}.deb
            ${homepage}/-/raw/master/LICENSE"
-checksum="f9b2c1d58713df105064b268e3808bb320737464f388e508755a23dcead64433
- 38f8c3d94c9497be761fc95f10d3c530a693bae33fa89d5ce29fe1fac45e3aea"
 
 do_extract() {
     cd ${wrksrc}
-    ar xv ${XBPS_SRCDISTDIR}/${pkgname}-${version}/whatsdesk_${version}_amd64.deb
+    ar xv ${XBPS_SRCDISTDIR}/${pkgname}-${version}/whatsdesk_${version}_${_debarch}.deb
 }
 
 do_install() {
diff --git a/srcpkgs/whatsdesk-git/template b/srcpkgs/whatsdesk-git/template
index 7c1a657..eb2bad8 100644
--- a/srcpkgs/whatsdesk-git/template
+++ b/srcpkgs/whatsdesk-git/template
@@ -1,6 +1,6 @@
 # Template file for 'whatsdesk-git'
 pkgname=whatsdesk-git
-version=0.3.8
+version=2022.09.08
 revision=1
 archs="i686 x86_64"
 hostmakedepends="nodejs jq"