diff --git a/.SRCINFO b/.SRCINFO
index ea2333b4dc4b..289674942a10 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
 pkgbase = hugin-messenger-bin
-	pkgdesc = The new version of the private messaging desktop application powered by the Kryptokrona Blockchain.
-	pkgver = 0.5.0
-	pkgrel = 2
+	pkgdesc = The new version of the private messaging desktop application powered by the Kryptokrona Blockchain.(Prebuilt version.Use system-wide electron)
+	pkgver = 0.6.1
+	pkgrel = 1
 	url = https://hugin.chat/
 	arch = x86_64
 	license = GPL-3.0-only
 	depends = electron19
-	provides = hugin-messenger=0.5.0
+	provides = hugin-messenger=0.6.1
 	conflicts = hugin-messenger
-	source = hugin-messenger-0.5.0.deb::https://github.com/kryptokrona/hugin-desktop/releases/download/v0.5.0/hugin-messenger_0.5.0_amd64.deb
+	source = hugin-messenger-0.6.1.deb::https://github.com/kryptokrona/hugin-desktop/releases/download/0.6.1/hugin-messenger_0.6.1_amd64.deb
 	source = hugin-messenger.sh
-	sha256sums = 5a1fb9270c2c8726b44b22e9c565f81fbe3f937adc739c3133d8e5a5dbb51990
-	sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051
+	sha256sums = 667cc43120b9e6cc5bb83690c48aa9668da3bf0352ee9ea6dd40a3995ae55c45
+	sha256sums = 291f50480f5a61bc9c68db7d44cd0412071128706baa868a9cb854f8779a1980
 
 pkgname = hugin-messenger-bin
diff --git a/PKGBUILD b/PKGBUILD
index 93c25c405c79..ccd53cd65d05 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=hugin-messenger-bin
 _pkgname="Hugin Messenger"
-pkgver=0.5.0
+pkgver=0.6.1
 _electronversion=19
-pkgrel=2
-pkgdesc="The new version of the private messaging desktop application powered by the Kryptokrona Blockchain."
+pkgrel=1
+pkgdesc="The new version of the private messaging desktop application powered by the Kryptokrona Blockchain.(Prebuilt version.Use system-wide electron)"
 arch=('x86_64')
 url="https://hugin.chat/"
 _ghurl="https://github.com/kryptokrona/hugin-desktop"
@@ -15,26 +15,29 @@ depends=(
     "electron${_electronversion}"
 )
 source=(
-    "${pkgname%-bin}-${pkgver}.deb::${_ghurl}/releases/download/v${pkgver}/${pkgname%-bin}_${pkgver}_amd64.deb"
+    "${pkgname%-bin}-${pkgver}.deb::${_ghurl}/releases/download/${pkgver}/${pkgname%-bin}_${pkgver}_amd64.deb"
     "${pkgname%-bin}.sh"
 )
-sha256sums=('5a1fb9270c2c8726b44b22e9c565f81fbe3f937adc739c3133d8e5a5dbb51990'
-            '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051')
+sha256sums=('667cc43120b9e6cc5bb83690c48aa9668da3bf0352ee9ea6dd40a3995ae55c45'
+            '291f50480f5a61bc9c68db7d44cd0412071128706baa868a9cb854f8779a1980')
 build() {
-    sed -e "s|@electronversion@|${_electronversion}|g" \
-        -e "s|@appname@|${pkgname%-bin}|g" \
-        -e "s|@runname@|app.asar|g" \
-        -e "s|@cfgdirname@|${_pkgname}|g" \
-        -e "s|@options@||g" \
-        -i "${srcdir}/${pkgname%-bin}.sh"
+    sed -e "
+        s/@electronversion@/${_electronversion}/g
+        s/@appname@/${pkgname%-bin}/g
+        s/@runname@/app.asar/g
+        s/@cfgdirname@/${_pkgname}/g
+        s/@options@//g
+    " -i "${srcdir}/${pkgname%-bin}.sh"
     bsdtar -xf "${srcdir}/data."*
-    sed "s|\"/opt/${_pkgname}/${pkgname%-bin}\"|${pkgname%-bin}|g;s|Utility|Network|g" \
-        -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
+    sed -e "
+        s/\"\/opt\/${_pkgname}\/${pkgname%-bin}\"/${pkgname%-bin}/g
+        s/Utility/Network/g
+    " -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
     install -Dm644 "${srcdir}/opt/${_pkgname}/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/opt/${_pkgname}/resources/bin/"*.png -t "${pkgdir}/usr/lib/${pkgname%-bin}/bin"
+    cp -Pr --no-preserve=ownership "${srcdir}/opt/${_pkgname}/resources/"{app.asar.unpacked,bin} "${pkgdir}/usr/lib/${pkgname%-bin}"
     install -Dm644 "${srcdir}/usr/share/icons/hicolor/0x0/apps/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
     install -Dm644 "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
 }
\ No newline at end of file
diff --git a/hugin-messenger.sh b/hugin-messenger.sh
index 4cfe3ac09dd8..40e422ca2ee7 100644
--- a/hugin-messenger.sh
+++ b/hugin-messenger.sh
@@ -21,7 +21,7 @@ if [[ -f "${_FLAGS_FILE}" ]]; then
         fi
     done < "${_FLAGS_FILE}"
 fi
-cd "${_APPDIR}"
+cd "${_APPDIR}" || { echo "Failed to change directory to ${_APPDIR}"; exit 1; }
 if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then
     exec electron@electronversion@ "${_RUNNAME}" ${_OPTIONS} "${_USER_FLAGS[@]}" "$@"
 else