diff --git a/hayai/PKGBUILD b/hayai/PKGBUILD
new file mode 100644
index 0000000..512d374
--- /dev/null
+++ b/hayai/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer: Louis Dalibard <ontake@ontake.dev>
+_pkgbase="ontake-hayai"
+pkgname="$_pkgbase-git"
+pkgver=r9.ga15715a
+pkgrel=1
+pkgdesc="An EEW system for Linux using JMA data provided by the Wolfx Project."
+arch=("x86_64" "armv7h" "aarch64")
+url="https://github.com/make-42/hayai"
+license=('GPL3')
+groups=()
+depends=()
+makedepends=('go>=1.18')
+optdepends=()
+provides=("$_pkgbase")
+conflicts=("$_pkgbase")
+replaces=()
+backup=()
+options=()
+install=
+changelog=
+source=("git+https://github.com/make-42/hayai")
+noextract=()
+md5sums=("SKIP") #autofill using updpkgsums
+
+pkgver() {
+	cd ${srcdir}/hayai
+	echo "r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
+}
+
+build() {
+	cd "${srcdir}/hayai"
+	go mod tidy
+	go build
+}
+	
+package() {
+	install -Dm755 "${srcdir}/hayai/hayai" "${pkgdir}"/usr/bin/hayai
+}
diff --git a/himitsu/PKGBUILD b/himitsu/PKGBUILD
index 035b984..918a8ff 100644
--- a/himitsu/PKGBUILD
+++ b/himitsu/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Louis Dalibard <ontake@ontake.dev>
-_pkgbase="ontk-himitsu"
+_pkgbase="ontake-himitsu"
 pkgname="$_pkgbase-git"
-pkgver=r4.ge3bd7be
+pkgver=r10.g1840670
 pkgrel=1
 pkgdesc="A tiny command line 2FA TOTP client."
 arch=("x86_64" "armv7h" "aarch64")
@@ -34,5 +34,5 @@ build() {
 }
 	
 package() {
-	install -Dm755 "${srcdir}/himitsu/himitsu" "${pkgdir}"/usr/bin/himitsu
+	install -Dm755 "${srcdir}/himitsu/himitsu" "${pkgdir}"/usr/bin/ohimitsu
 }
diff --git a/leech/PKGBUILD b/leech/PKGBUILD
index bcee39b..9190830 100644
--- a/leech/PKGBUILD
+++ b/leech/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Louis Dalibard <ontake@ontake.dev>
-_pkgbase="leech"
+_pkgbase="ontake-leech"
 pkgname="$_pkgbase-git"
 pkgver=r11.gd38556b
 pkgrel=1
-pkgdesc="A simple HTTP(S) file hosting server."
+pkgdesc="A simple HTTP(S) file hosting server with a simple UI."
 arch=("x86_64" "armv7h" "aarch64")
 url="https://git.ontake.dev/go/leech"
 license=('GPL3')
@@ -23,19 +23,19 @@ noextract=()
 md5sums=("SKIP") #autofill using updpkgsums
 
 pkgver() {
-	cd ${srcdir}/${_pkgbase}
+	cd ${srcdir}/leech
 	echo "r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
 }
 
 build() {
-	cd "${srcdir}/${_pkgbase}"
+	cd "${srcdir}/leech"
 	go mod tidy
 	go build
 }
 	
 package() {
-	install -Dm755 "${srcdir}/${_pkgbase}/${_pkgbase}" "${pkgdir}"/usr/bin/${_pkgbase}
-	install -Dm644 "${srcdir}/${_pkgbase}/pkg/config.json" "${pkgdir}"/etc/leech/config.json.example
-	install -Dm644 "${srcdir}/${_pkgbase}/pkg/leech.service" "${pkgdir}"/usr/lib/systemd/system/leech.service
-	install -Dm644 "${srcdir}/${_pkgbase}/pkg/sysusers.conf" "${pkgdir}"/usr/lib/sysusers.d/${_pkgbase}.conf
+	install -Dm755 "${srcdir}/leech/leech" "${pkgdir}"/usr/bin/leech
+	install -Dm644 "${srcdir}/leech/pkg/config.json" "${pkgdir}"/etc/leech/config.json.example
+	install -Dm644 "${srcdir}/leech/pkg/leech.service" "${pkgdir}"/usr/lib/systemd/system/leech.service
+	install -Dm644 "${srcdir}/leech/pkg/sysusers.conf" "${pkgdir}"/usr/lib/sysusers.d/leech.conf
 }