diff --git a/japanese/multiskkserv/Makefile b/japanese/multiskkserv/Makefile
index e609ede970a5..30a08d50dca4 100644
--- a/japanese/multiskkserv/Makefile
+++ b/japanese/multiskkserv/Makefile
@@ -1,42 +1,44 @@
 PORTNAME=	multiskkserv
 DISTVERSION=	20240224
+PORTREVISION=	1
 CATEGORIES=	japanese
 
 MAINTAINER=	mew14930xvi@inbox.lv
 COMMENT=	Multiple dictionary server for the SKK
 WWW=		https://github.com/sina-ht/multiskkserv/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${LOCALBASE}/${SKKDIR}/SKK-JISYO.L.cdb:japanese/skk-jisyo-cdb \
 		${LOCALBASE}/${SKKDIR}/SKK-JISYO.jawiki.cdb:japanese/skk-jawiki
 
 USES=		autoreconf libtool
 USE_GITHUB=	yes
 GH_ACCOUNT=	sina-ht
 GH_TAGNAME=	2ffe7cd
 
 SKKDIR?=	share/skk
 SKKJISYO_TYPE?=	L JIS2 JIS3_4 jawiki
 
 USE_RC_SUBR=	${PORTNAME}
 GNU_CONFIGURE=	yes
 
 SUB_FILES=	${PORTNAME}
 SUB_LIST=	SKKDICS="${SKKJISYO_TYPE:S/^/${PREFIX}\/${SKKDIR}\/SKK-JISYO./:S/$/.cdb/}"
 
 PLIST_FILES=	bin/skkdic-p2cdb sbin/multiskkserv sbin/multiskkserv-ctl
 
 OPTIONS_DEFINE=		CDB
 OPTIONS_DEFAULT=	CDB
 CDB_DESC=		Use databases/cdb instead of bundled tinycdb
 CDB_EXTRACT_DEPENDS=	${NONEXISTENT}:databases/cdb:build
 CDB_CONFIGURE_ON=	--with-cdb=`${MAKE} -C ${PORTSDIR}/databases/cdb -V WRKSRC`
+CDB_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-configure.ac
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/skkdic-p2cdb ${STAGEDIR}${PREFIX}/bin
 	cd ${WRKSRC}/src && ${INSTALL_PROGRAM} multiskkserv multiskkserv-ctl \
 		${STAGEDIR}${PREFIX}/sbin
 
 .include <bsd.port.mk>
diff --git a/japanese/multiskkserv/files/extra-patch-configure.ac b/japanese/multiskkserv/files/extra-patch-configure.ac
new file mode 100644
index 000000000000..3a3c751af68c
--- /dev/null
+++ b/japanese/multiskkserv/files/extra-patch-configure.ac
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2025-10-28 08:55:54 UTC
++++ configure.ac
+@@ -118,7 +118,7 @@ else
+       CDB_DIR="$with_cdb"
+       CDB_INCLUDES="-I$with_cdb"
+       available_cdb="yes"
+-      for j in cdb.a buffer.a unix.a byte.a alloc.a; do
++      for j in cdb.a buffer.a unix.a byte.a; do
+         if test -f "$with_cdb/$j"; then
+           LIBADD_CDB="$LIBADD_CDB $with_cdb/$j"
+         else