diff --git a/libwlocate/.SRCINFO b/libwlocate/.SRCINFO
new file mode 100644
index 0000000000..cc904e5691
--- /dev/null
+++ b/libwlocate/.SRCINFO
@@ -0,0 +1,15 @@
+pkgbase = libwlocate
+	pkgdesc = A shared library that can be used for location-based services
+	pkgver = 0.1
+	pkgrel = 4
+	epoch = 1
+	url = https://sourceforge.net/projects/libwlocate
+	arch = x86_64
+	license = GPL-3.0-or-later
+	makedepends = git
+	depends = glibc
+	depends = wireless_tools
+	source = git+https://github.com/openwifi-su/lwlocate#tag=v0.1
+	sha256sums = f4022b1dfcaf7c9a4cc54a913c6246a6f08e1646b71416ffa4794d6a56479f2c
+
+pkgname = libwlocate
diff --git a/libwlocate/.nvchecker.toml b/libwlocate/.nvchecker.toml
new file mode 100644
index 0000000000..6dc50fb852
--- /dev/null
+++ b/libwlocate/.nvchecker.toml
@@ -0,0 +1,4 @@
+[libwlocate]
+source = "git"
+git = "https://github.com/openwifi-su/lwlocate.git"
+prefix = "v"
diff --git a/libwlocate/PKGBUILD b/libwlocate/PKGBUILD
index 1911846aeb..1b2e5fc775 100644
--- a/libwlocate/PKGBUILD
+++ b/libwlocate/PKGBUILD
@@ -5,24 +5,33 @@
 
 pkgname=libwlocate
 pkgver=0.1
-pkgrel=3
+pkgrel=4
 epoch=1
-pkgdesc="A shared library that can be used for location-based services"
+pkgdesc='A shared library that can be used for location-based services'
 arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
-url="https://sourceforge.net/projects/libwlocate"
-license=(GPL)
-depends=(wireless_tools glibc)
-source=($pkgname-$pkgver.tar.gz::"https://github.com/openwifi-su/lwlocate/archive/v$pkgver.tar.gz")
-sha256sums=('791899f4890fa88553b4e8417376187d7d533ead962f5fe51f598b6ed9a2c258')
+url='https://sourceforge.net/projects/libwlocate'
+license=(GPL-3.0-or-later)
+depends=(glibc
+         wireless_tools)
+makedepends=(git)
+source=(git+https://github.com/openwifi-su/lwlocate#tag=v$pkgver)
+sha256sums=('f4022b1dfcaf7c9a4cc54a913c6246a6f08e1646b71416ffa4794d6a56479f2c')
+
+prepare() {
+  cd lwlocate/master
+# Honor system CFLAGS
+  sed -e "s|^DBGFLAGS.*|DBGFLAGS = ${CFLAGS}|" -i Makelib -i Makefile
+  sed -e "s|LDFLAGS  = |LDFLAGS  = ${LDFLAGS} |" -i Makefile
+}
 
 build() {
-  cd lwlocate-$pkgver/master
+  cd lwlocate/master
   make -f Makelib
   make
 }
 
 package() {
-  cd lwlocate-$pkgver/master
+  cd lwlocate/master
   install -Dm644 libwlocate.so "$pkgdir"/usr/lib/libwlocate.so
   install -Dm644 libwlocate.h "$pkgdir"/usr/include/libwlocate.h
   install -Dm755 lwtrace "$pkgdir"/usr/bin/lwtrace