diff --git a/PKGBUILD b/PKGBUILD
index c497496ef7b17804c1fb14717c44324b5d5a4004..96241b29b6ca2e8cb7dc168655622cf37ac4ed80 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Maël 'Kubat' MARTIN <mael.martin31@gmail.com>
-pkgname=lektor-git
-pkgver=mk7.v1.5.36.g892a8aa.v1.5.36.g892a8aa.v1.5.36.g892a8aa
+pkgname=lektor
+pkgver=mk7.816.96f704e.816.96f704e
 pkgrel=1
 pkgdesc="The lektor kara player, from the Bakaclub"
 arch=(x86_64 i686)
@@ -11,22 +11,21 @@ depends=('sqlite3>=3.31.0' curl json-c xorg-server mpv sdl2)
 makedepends=(git meson ninja bash 'gcc>=8.1')
 provides=(lektor)
 changelog=.Changelog
-source=("git+$url")
-md5sums=('SKIP')
+source=()
 
 pkgver() {
-    cd lektor
-    printf "$pkgver.%s" "$(git describe --tags | sed 's/-/\./g' )"
+    cd ..
+    printf "$pkgver.%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-    cd lektor
+    cd ..
     meson build/
-    meson configure build/ -Dbuildtype=release -Ddebug=false -Doptimization=3 -Dstripe=true
+    meson configure build/ -Dbuildtype=release -Ddebug=false -Doptimization=3 -Dstrip=true
     ninja -C build/
 }
 
 package() {
-    cd lektor
+    cd ..
     ninja -C build/ install
 }
diff --git a/src/main/lkt.c b/src/main/lkt.c
index 073f0c191e2c1124949ddad8068f6d1167b801d0..8ab454adb96e83f47c107f01ffd2efb5396a9049 100644
--- a/src/main/lkt.c
+++ b/src/main/lkt.c
@@ -306,8 +306,7 @@ ping__(struct lkt_cmd_args *args)
         fail("Failed to recieve the response of lektord");
     if (!STR_NMATCH(buff, "OK", 2))
         fail("ACK");
-    (void) write(1, "OK\n", sizeof("OK\n"));
-    exit(EXIT_SUCCESS);
+    exit(write(1, "OK\n", sizeof("OK\n")) > 0);
 }
 
 noreturn void
diff --git a/src/main/lktadm.c b/src/main/lktadm.c
index 180e29ab523276492acd2600b5308dfe1a292026..009d93d6114d08fdbc84ff663dcc28edbd12bafe 100644
--- a/src/main/lktadm.c
+++ b/src/main/lktadm.c
@@ -25,8 +25,7 @@ fail(const char *format, ...)
     va_start(ap, format);
     vfprintf(stderr, format, ap);
     va_end(ap);
-    (void) write(2, "\n", 1);
-    exit(EXIT_FAILURE);
+    exit(write(2, "\n", 1) > 0);
 }
 
 /* ----------------- *