diff --git a/PKGBUILD b/PKGBUILD
index adaba9b..81ee400 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,6 @@
 # Maintainer: TommyTran732
 # https://gitlab.manjaro.org/packages/extra/pamac
 
-#Set this flag to 0 if you want to use pamac-tray-icon-plasma
-ENABLE_APPINDICATOR=1
-
 pkgname=pamac-flatpak
 pkgver=10.4.2
 pkgrel=1
@@ -23,28 +20,19 @@ source=("pamac-$pkgver.tar.gz::$url/-/archive/v$pkgver/pamac-v$pkgver.tar.gz")
 sha512sums=('8b5b2298e16bcfc6fbdfbf2e2cd77cb9cd769d9faa503dd8fec35c18f37b52589ffda670dc9299a8f4962f039ba870007b4601a2610ac0fc298f64a4f8e67eeb')
 
 prepare() {
-  cd "$srcdir/pamac-v$pkgver"
   # adjust version string
-  sed -i -e "s|\"$_pkgfixver\"|\"$pkgver-$pkgrel\"|g" src/version.vala
+  sed -i -e "s|\"$_pkgfixver\"|\"$pkgver-$pkgrel\"|g" $srcdir/pamac-v$pkgver/src/version.vala
 }
 
 build() {
-  cd "$srcdir/pamac-v$pkgver"
-  mkdir -p builddir
-  cd builddir
-  meson --prefix=/usr --sysconfdir=/etc --buildtype=release -Denable-fake-gnome-software=true
-  # build
-  ninja
+  arch-meson --buildtype=release -Denable-fake-gnome-software=false $srcdir/pamac-v$pkgver build
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
 }
 
 package() {
-  cd "$srcdir/pamac-v$pkgver/builddir"
-
-  DESTDIR="$pkgdir" ninja install
-  # remove pamac-gnome-integration
-  rm "$pkgdir/usr/bin/gnome-software"
-  rm "$pkgdir/usr/share/applications/org.gnome.Software.desktop"
-  rm "$pkgdir/usr/share/dbus-1/services/org.gnome.Software.service"
-
-}
-# vim:set ts=2 sw=2 et:
\ No newline at end of file
+  meson install -C build --destdir "$pkgdir"
+}
\ No newline at end of file