diff --git a/.SRCINFO b/.SRCINFO
index 4a76f7b..6f2443a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = hardcode-tray-git
 	pkgdesc = Fixes Hardcoded Tray Icons
-	pkgver = 3.8.r8.g1c5c822
-	pkgrel = 2
+	pkgver = 4.0.r0.g8ec819f
+	pkgrel = 1
 	url = https://github.com/bil-elmoussaoui/Hardcode-Tray
 	arch = i686
 	arch = x86_64
 	license = GPL-3.0
-	makedepends = git
+	makedepends = ninja
+	makedepends = meson
 	depends = python
 	depends = python-gobject
 	depends = python-cairosvg
@@ -14,12 +15,12 @@ pkgbase = hardcode-tray-git
 	depends = gtk3
 	optdepends = sni-qt-patched-git: patched qt4 sni plugin to enable icon modification
 	optdepends = inkscape: to convert svg to png with inkscape
-	optdepends = lib32-sni-qt-patched-git: 32-bit patched qt4 sni plugin to enable icon modification
 	provides = hardcode-tray-git
 	conflicts = hardcode-tray-fixer-git
 	conflicts = hardcode-tray
 	source = git://github.com/bil-elmoussaoui/Hardcode-Tray
 	sha256sums = SKIP
+	optdepends_x86_64 = lib32-sni-qt-patched-git: 32-bit patched qt4 sni plugin to enable icon modification
 
 pkgname = hardcode-tray-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ca22e9e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+pkg/
+src/
+*.tar.gz
+*.tar.xz
+Hardcode-Tray/
diff --git a/PKGBUILD b/PKGBUILD
index 528b9e8..9fb6a20 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 _pkgbase=hardcode-tray-git
 _gitname=Hardcode-Tray
 pkgname=$_pkgbase
-pkgver=3.8.r8.g1c5c822
-pkgrel=2
+pkgver=4.0.r0.g8ec819f
+pkgrel=1
 pkgdesc="Fixes Hardcoded Tray Icons"
 arch=('i686' 'x86_64')
 url="https://github.com/bil-elmoussaoui/Hardcode-Tray"
@@ -13,6 +13,7 @@ license=('GPL-3.0')
 provides=("$_pkgbase")
 makedepends=("git")
 conflicts=("hardcode-tray-fixer-git" "hardcode-tray")
+makedepends=('ninja' 'meson')
 depends=('python' 'python-gobject' 'python-cairosvg' 'librsvg' 'gtk3')
 optdepends=('sni-qt-patched-git: patched qt4 sni plugin to enable icon modification' 'inkscape: to convert svg to png with inkscape')
 optdepends_x86_64=('lib32-sni-qt-patched-git: 32-bit patched qt4 sni plugin to enable icon modification')
@@ -27,10 +28,12 @@ pkgver() {
   )
 }
 
-package() {
-  install -Dm755 "$srcdir/$_gitname/hardcode-tray.py" "$pkgdir/opt/$_gitname/hardcode-tray.py"
-  install -Dm755 "$srcdir/$_gitname/hardcode-tray" "$pkgdir/usr/bin/hardcode-tray"
-  install -d "$pkgdir/opt/$_gitname"
-  cp -r -f "$srcdir/$_gitname/src" "$pkgdir/opt/$_gitname"
-  cp -r -f "$srcdir/$_gitname/data" "$pkgdir/opt/$_gitname"
+build() {
+  cd "$srcdir/${_gitname}"
+  meson builddir --prefix=/usr
+}
+
+package() {
+  cd "$srcdir/${_gitname}"
+  DESTDIR="${pkgdir}" ninja -C builddir install
 }