diff --git a/irc/Makefile b/irc/Makefile
index e08e7bed988b..64d04e768d37 100644
--- a/irc/Makefile
+++ b/irc/Makefile
@@ -110,6 +110,7 @@
     SUBDIR += weechat
     SUBDIR += weechat-otr
     SUBDIR += znc
+    SUBDIR += znc-clientbuffer
     SUBDIR += znc-push
 
 .include <bsd.port.subdir.mk>
diff --git a/irc/znc-clientbuffer/Makefile b/irc/znc-clientbuffer/Makefile
new file mode 100644
index 000000000000..3c675870b5d2
--- /dev/null
+++ b/irc/znc-clientbuffer/Makefile
@@ -0,0 +1,34 @@
+PORTNAME=	znc-clientbuffer
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.0.48
+CATEGORIES=	irc
+
+MAINTAINER=	mdw@FreeBSD.org
+COMMENT=	Client specific buffers module for ZNC
+WWW=		https://wiki.znc.in/Clientbuffer
+
+LICENSE=	APACHE20
+
+BUILD_DEPENDS=	znc:irc/znc
+RUN_DEPENDS=	znc:irc/znc
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	CyberShadow
+
+ALL_TARGET=	clientbuffer.so
+
+PLIST_FILES=	lib/znc/clientbuffer.so
+
+PORTDOCS=		README.md
+
+OPTIONS_DEFINE=	DOCS
+
+do-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/znc
+	${INSTALL_PROGRAM} ${WRKSRC}/clientbuffer.so ${STAGEDIR}${PREFIX}/lib/znc/clientbuffer.so
+
+do-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.md  ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/irc/znc-clientbuffer/distinfo b/irc/znc-clientbuffer/distinfo
new file mode 100644
index 000000000000..3b3e95c159d1
--- /dev/null
+++ b/irc/znc-clientbuffer/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1671444548
+SHA256 (CyberShadow-znc-clientbuffer-v1.0.48_GH0.tar.gz) = c16e78351b78d62c1ce60164bb903041d67d414172116367f8a1075b7d347e90
+SIZE (CyberShadow-znc-clientbuffer-v1.0.48_GH0.tar.gz) = 5602
diff --git a/irc/znc-clientbuffer/pkg-descr b/irc/znc-clientbuffer/pkg-descr
new file mode 100644
index 000000000000..201f0f9a010b
--- /dev/null
+++ b/irc/znc-clientbuffer/pkg-descr
@@ -0,0 +1,2 @@
+ZNC Clientbuffer is a module for ZNC that allows to maintain client specific
+buffers for identified clients.