diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile
index 9a3e58730d80..1bb425eef3f3 100644
--- a/japanese/canna-server/Makefile
+++ b/japanese/canna-server/Makefile
@@ -1,39 +1,33 @@
 PORTNAME=	canna
-PORTVERSION=	3.7p3
-PORTREVISION=	11
+PORTVERSION=	3.7p5
 CATEGORIES=	japanese
-MASTER_SITES=	OSDN/canna
+MASTER_SITES=	https://github.com/canna-input/canna/releases/download/release-${PORTVERSION}/
 PKGNAMESUFFIX=	-server
 DISTNAME=	Canna${PORTVERSION:S/.//g}
 
-MAINTAINER=	hrs@FreeBSD.org
+MAINTAINER=	mce@FreeBSD.org
 COMMENT=	Kana-to-Kanji conversion system, binary part
-WWW=		http://canna.sourceforge.jp/
+WWW=		https://canna-input.github.io/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 LIB_DEPENDS=	libcanna.so:japanese/canna-lib
 
 USES=		imake tar:bzip2
 USE_RC_SUBR=	canna
 INSTALL_TARGET=	instserver instclient
-PORTDOCS=	canna.bib canna.sty Imakefile README.jp Makefile \
-		intern lisp man
+PORTDOCS=	CHANGES.jp ChangeLog README.jp RKCCONF.jp
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD
-MAKE_ARGS+=	CCOPTIONS="-Wno-error=int-conversion"
-.endif
-
 post-install:
 	@cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
 	    ${MAKEFILE} ${MAKE_ARGS} install.man
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/doc && ${CP} -R ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	@cd ${STAGEDIR}${PREFIX}/sbin && ${RM} cannakill && \
+		${RLN} ../bin/catdic cannakill
 
 .include <bsd.port.mk>
diff --git a/japanese/canna-server/distinfo b/japanese/canna-server/distinfo
index 45f866e970fd..9157d736206c 100644
--- a/japanese/canna-server/distinfo
+++ b/japanese/canna-server/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Canna37p3.tar.bz2) = 7d98d925043d3af24f99a8a2a09e3b4d6dfe881efc1303ef4a7f495a0f4542a7
-SIZE (Canna37p3.tar.bz2) = 1263065
+TIMESTAMP = 1760649197
+SHA256 (Canna37p5.tar.bz2) = 892bc8adac9fac7972dbcc6554d70054a3a36270ed1cff66b34965db1a97941c
+SIZE (Canna37p5.tar.bz2) = 1294016
diff --git a/japanese/canna-server/files/patch-lib-RK-ncache.c b/japanese/canna-server/files/patch-lib-RK-ncache.c
deleted file mode 100644
index 1695441e8b3b..000000000000
--- a/japanese/canna-server/files/patch-lib-RK-ncache.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/RK/ncache.c.orig	2003-09-17 17:50:52.000000000 +0900
-+++ lib/RK/ncache.c	2008-09-20 01:46:07.000000000 +0900
-@@ -27,7 +27,7 @@
- #include	"RKintern.h"
- 
- #define	NCHASH		101
--#define	hash(x)		((int)((x)%NCHASH))
-+#define	hash(x)		((int)(((unsigned long)(x))%NCHASH))
- 
- static struct ncache	Nchash[NCHASH];
- static struct ncache	Ncfree;