diff --git a/anda/tools/keyd/keyd.spec b/anda/tools/keyd/keyd.spec
index 91a27842d9..dac5e79f8a 100644
--- a/anda/tools/keyd/keyd.spec
+++ b/anda/tools/keyd/keyd.spec
@@ -1,27 +1,32 @@
 Name:			keyd
 Version:		2.5.0
-Release:		1%?dist
+Release:		2%?dist
 Summary:		Key remapping daemon for linux
 URL:			https://github.com/rvaiya/keyd
 License:		MIT
-Suggests:		python3 python3-xlib
-BuildRequires:	gcc mold make kernel-headers systemd-rpm-macros git-core
+Source0:        %url/archive/refs/tags/v%version.tar.gz
+BuildRequires:	gcc mold make kernel-headers systemd-rpm-macros anda-srpm-macros
+Packager:   madonuko <mado@fyralabs.com>
 
 %description
 keyd provides a flexible system wide daemon which remaps keys using kernel
 level input primitives (evdev, uinput).
 
 %prep
-rm -rf ./*
-git clone --depth 1 -b v%version %url .
+%autosetup
+cat<<EOF > keyd.conf
+g keyd
+EOF
 
 %build
-%make_build
+%make_build PREFIX=%_prefix LDFLAGS="$LDFLAGS -fuse-ld=mold"
 
 %install
-%make_install PREFIX=%_prefix
+%make_install PREFIX=%_prefix LDFLAGS="$LDFLAGS -fuse-ld=mold"
 install -Dm644 keyd.service %buildroot%_unitdir/keyd.service
-sed -i 's@local/@@g' %buildroot%_unitdir/keyd.service
+install -Dm644 keyd.conf -t %buildroot%_sysusersdir
+install -Dm755 scripts/dump-xkb-config -t %buildroot%_datadir/keyd/
+install -Dm755 scripts/generate_xcompose -t %buildroot%_datadir/keyd/
 
 %post
 %systemd_post keyd.service
@@ -40,9 +45,6 @@ sed -i 's@local/@@g' %buildroot%_unitdir/keyd.service
 %_bindir/keyd-application-mapper
 %_datadir/keyd
 %_datadir/doc/keyd/
+%_sysusersdir/keyd.conf
 %_mandir/man1/keyd-application-mapper.1.gz
 %_mandir/man1/keyd.1.gz
-
-%changelog
-* Tue May 23 2023 windowsboy111 <windowsboy111@fyralabs.com> - 2.4.3-1
-- Initial package