diff --git a/pkg/arch-git/.SRCINFO b/pkg/arch-git/.SRCINFO
new file mode 100644
index 0000000..c476790
--- /dev/null
+++ b/pkg/arch-git/.SRCINFO
@@ -0,0 +1,13 @@
+pkgbase = solo2-cli-git
+	pkgdesc = Command line interface to SoloKeys Solo 2 devices
+	pkgver = r18.221f4d1
+	pkgrel = 1
+	url = https://github.com/solokeys/solo2-cli
+	arch = any
+	license = MIT
+	depends = rust
+	provides = solo2-cli
+	source = git+https://github.com/solokeys/solo2-cli.git#branch=main
+	sha256sums = SKIP
+
+pkgname = solo2-cli-git
diff --git a/pkg/arch-git/.gitignore b/pkg/arch-git/.gitignore
new file mode 100644
index 0000000..2341587
--- /dev/null
+++ b/pkg/arch-git/.gitignore
@@ -0,0 +1,4 @@
+pkg/
+src/
+*.tar.*
+solo2-cli
diff --git a/pkg/arch-git/Makefile b/pkg/arch-git/Makefile
new file mode 100644
index 0000000..21043b2
--- /dev/null
+++ b/pkg/arch-git/Makefile
@@ -0,0 +1,17 @@
+PKG := solo2-cli-git
+
+build:
+	makepkg -f
+
+install:
+	yes | makepkg -i
+
+clean:
+	rm -rf pkg src
+	rm -rf $(PKG)*
+
+update-srcinfo:
+	makepkg --printsrcinfo > .SRCINFO
+
+generate-checksums:
+	makepkg -g -f -p PKGBUILD
diff --git a/pkg/arch-git/PKGBUILD b/pkg/arch-git/PKGBUILD
new file mode 100644
index 0000000..ce7df42
--- /dev/null
+++ b/pkg/arch-git/PKGBUILD
@@ -0,0 +1,40 @@
+# Maintainer: Nicolas Stalder <n+archlinux@stalder.io>
+pkgname=solo2-cli-git
+pkgver=r18.221f4d1
+pkgrel=1
+pkgdesc="Command line interface to SoloKeys Solo 2 devices"
+url="https://github.com/solokeys/solo2-cli"
+arch=(any)
+license=(MIT)
+depends=(rust)
+provides=(solo2-cli)
+
+source=('git+https://github.com/solokeys/solo2-cli.git#branch=main')
+# add dummy entries for `make generate-checksums` to create SHA256 instead of MD5 check sums
+sha256sums=('SKIP')
+
+pkgver() {
+  cd "$srcdir/solo2-cli"
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+prepare() {
+  true
+}
+
+pkg=solo2-cli
+
+build() {
+  cd $srcdir/solo2-cli
+  cargo build --release
+}
+
+package() {
+  install -Dm755 "$srcdir/solo2-cli/target/release/solo2" -T "$pkgdir/usr/bin/solo2"
+
+  _src=$srcdir/$pkg
+  install -Dm644 "$_src/LICENSE-MIT" "$pkgdir/usr/share/licenses/$pkgname/LICENSE-MIT"
+
+  install -Dm644 $_src/target/release/_solo2 -t $pkgdir/usr/share/zsh/site-functions
+  install -Dm644 $_src/target/release/solo2.bash $pkgdir/usr/share/bash-completion/completions/solo2
+}