diff --git a/srcpkgs/kcgi/files/configure.glibc b/srcpkgs/kcgi/files/configure.glibc
deleted file mode 100644
index a212f75c1f5..00000000000
--- a/srcpkgs/kcgi/files/configure.glibc
+++ /dev/null
@@ -1,26 +0,0 @@
-HAVE_ARC4RANDOM=0
-HAVE_CAPSICUM=0
-HAVE_ERR=1
-HAVE_EXPLICIT_BZERO=1
-HAVE_GETPROGNAME=0
-HAVE_INFTIM=0
-HAVE_MD5=0
-HAVE_MEMMEM=1
-HAVE_MEMRCHR=1
-HAVE_MEMSET_S=0
-HAVE_PATH_MAX=1
-HAVE_PLEDGE=0
-HAVE_PROGRAM_INVOCATION_SHORT_NAME=1
-HAVE_REALLOCARRAY=0
-HAVE_RECALLOCARRAY=0
-HAVE_SANDBOX_INIT=0
-HAVE_SECCOMP_FILTER=1
-HAVE_SOCK_NONBLOCK=1
-HAVE_STRLCAT=0
-HAVE_STRLCPY=0
-HAVE_STRNDUP=1
-HAVE_STRNLEN=1
-HAVE_STRTONUM=0
-HAVE_SYSTRACE=0
-HAVE_ZLIB=0
-HAVE___PROGNAME=1
diff --git a/srcpkgs/kcgi/files/configure.musl b/srcpkgs/kcgi/files/configure.musl
deleted file mode 100644
index d0b4fb0809a..00000000000
--- a/srcpkgs/kcgi/files/configure.musl
+++ /dev/null
@@ -1,26 +0,0 @@
-HAVE_ARC4RANDOM=0
-HAVE_CAPSICUM=0
-HAVE_ERR=1
-HAVE_EXPLICIT_BZERO=0
-HAVE_GETPROGNAME=0
-HAVE_INFTIM=0
-HAVE_MD5=0
-HAVE_MEMMEM=1
-HAVE_MEMRCHR=1
-HAVE_MEMSET_S=0
-HAVE_PATH_MAX=1
-HAVE_PLEDGE=0
-HAVE_PROGRAM_INVOCATION_SHORT_NAME=1
-HAVE_REALLOCARRAY=0
-HAVE_RECALLOCARRAY=0
-HAVE_SANDBOX_INIT=0
-HAVE_SECCOMP_FILTER=1
-HAVE_SOCK_NONBLOCK=1
-HAVE_STRLCAT=1
-HAVE_STRLCPY=1
-HAVE_STRNDUP=1
-HAVE_STRNLEN=1
-HAVE_STRTONUM=0
-HAVE_SYSTRACE=0
-HAVE_ZLIB=0
-HAVE___PROGNAME=1
diff --git a/srcpkgs/kcgi/template b/srcpkgs/kcgi/template
index ce066d14999..24e27db78ac 100644
--- a/srcpkgs/kcgi/template
+++ b/srcpkgs/kcgi/template
@@ -1,34 +1,17 @@
 # Template file for 'kcgi'
 pkgname=kcgi
-version=0.10.7
+version=0.10.8
 revision=1
-build_style=gnu-makefile
+build_style=configure
+configure_args="PREFIX=/usr MANDIR=/usr/share/man SBINDIR=/usr/bin"
+make_check_target="regress"
 checkdepends="pkg-config libcurl-devel"
 short_desc="Minimal CGI library for web applications in C"
 maintainer="Duncaen <duncaen@voidlinux.eu>"
 license="ISC"
 homepage="http://kristaps.bsd.lv/kcgi/"
 distfiles="http://kristaps.bsd.lv/kcgi/snapshots/kcgi-${version}.tgz"
-checksum=7bb64212262de06c1203a326cf5873aebac3b80fa35ee9dc7e13a494a762723f
-
-do_configure() {
-	local _libc=glibc
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) _libc=musl ;;
-	esac
-	if [ -n "$CROSS_BUILD" ]; then
-		cp "${FILESDIR}/configure.$_libc" configure.local
-	fi
-	case "$XBPS_TARGET_MACHINE" in
-		x86_64*|i686*|armv*) ;;
-		*) sed -i 's/HAVE_SECCOMP_FILTER=1/HAVE_SECCOMP_FILTER=0/' configure.local ;;
-	esac
-	./configure PREFIX=/usr MANDIR=/usr/share/man SBINDIR=/usr/bin
-}
-
-do_check() {
-	make regress
-}
+checksum=878c8134d48a3048ea0bc28315fe95698fb9c764023d9244610d7e481ef3734c
 
 post_install() {
 	sed -n '2,16p' kcgi.c > LICENSE