diff --git a/aur.txt b/aur.txt
index f913f5f..eb6b119 100644
--- a/aur.txt
+++ b/aur.txt
@@ -28,7 +28,6 @@ jdk17-graalvm-bin
 jellyfin-ffmpeg5
 kodi-standalone-service
 ksmbd-dkms
-ksmbd-tools
 megatools
 molotov
 native-image-jdk17-bin
diff --git a/ksmbd-tools/.SRCINFO b/ksmbd-tools/.SRCINFO
new file mode 100644
index 0000000..b408b2d
--- /dev/null
+++ b/ksmbd-tools/.SRCINFO
@@ -0,0 +1,21 @@
+pkgbase = ksmbd-tools-git
+	pkgdesc = Userspace tools for the ksmbd kernel SMB server
+	pkgver = 3.4.6+29+ga09f767
+	pkgrel = 1
+	url = https://github.com/cifsd-team/ksmbd-tools
+	arch = x86_64
+	arch = i686
+	arch = aarch64
+	arch = armv7h
+	arch = armv6h
+	license = GPL2
+	makedepends = meson
+	depends = KSMBD-MODULE
+	depends = libnl
+	provides = samba
+	provides = ksmbd-tools
+	conflicts = ksmbd-tools
+	source = git+https://github.com/cifsd-team/ksmbd-tools.git
+	sha256sums = SKIP
+
+pkgname = ksmbd-tools-git
diff --git a/ksmbd-tools/.gitignore b/ksmbd-tools/.gitignore
new file mode 100644
index 0000000..05c6d4d
--- /dev/null
+++ b/ksmbd-tools/.gitignore
@@ -0,0 +1,4 @@
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
diff --git a/ksmbd-tools/PKGBUILD b/ksmbd-tools/PKGBUILD
new file mode 100644
index 0000000..da81084
--- /dev/null
+++ b/ksmbd-tools/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Leonidas P. <jpegxguy at outlook dot com>
+
+pkgname=ksmbd-tools-git
+pkgver=3.4.6+29+ga09f767
+pkgrel=1
+pkgdesc="Userspace tools for the ksmbd kernel SMB server"
+arch=('x86_64' 'i686' 'aarch64' 'armv7h' 'armv6h')
+url="https://github.com/cifsd-team/ksmbd-tools"
+license=('GPL2')
+makedepends=('meson')
+depends=('KSMBD-MODULE' 'libnl')
+provides=('samba' 'ksmbd-tools')
+conflicts=('ksmbd-tools')
+source=(git+${url}.git)
+sha256sums=('SKIP')
+
+pkgver() {
+	cd ksmbd-tools
+	git describe --tags | sed 's/^pkgconf-//;s/-/+/g'
+}
+
+build() {
+	cd ksmbd-tools
+	arch-meson build
+	meson compile -C build
+}
+
+package() {
+	cd ksmbd-tools
+	meson install -C build --destdir "$pkgdir"
+}