diff --git a/net-p2p/Makefile b/net-p2p/Makefile
index 35e1957b13bb..b858c6bcaec9 100644
--- a/net-p2p/Makefile
+++ b/net-p2p/Makefile
@@ -1,114 +1,115 @@
     COMMENT = Peer-to-peer network applications
 
     SUBDIR += amule
     SUBDIR += autoscan
     SUBDIR += awgg
     SUBDIR += bazarr
     SUBDIR += bitcoin
     SUBDIR += bitcoin-daemon
     SUBDIR += bitcoin-utils
     SUBDIR += bitflu
     SUBDIR += bitmark
     SUBDIR += bitmark-cli
     SUBDIR += bitmark-daemon
     SUBDIR += bitmark-recorder
     SUBDIR += btcheck
     SUBDIR += btpd
     SUBDIR += c-lightning
     SUBDIR += cardano-db-sync
     SUBDIR += cardano-node
+    SUBDIR += clboss
     SUBDIR += cncli
     SUBDIR += cpuminer
     SUBDIR += createtorrent
     SUBDIR += ctcs
     SUBDIR += ctorrent
     SUBDIR += dclib
     SUBDIR += deluge
     SUBDIR += deluge-cli
     SUBDIR += ed2k
     SUBDIR += ed2k-hash
     SUBDIR += eiskaltdcpp-cli
     SUBDIR += eiskaltdcpp-daemon
     SUBDIR += eiskaltdcpp-data
     SUBDIR += eiskaltdcpp-gtk
     SUBDIR += eiskaltdcpp-lib
     SUBDIR += ethash
     SUBDIR += frost
     SUBDIR += go-ethereum
     SUBDIR += go-prysm
     SUBDIR += gtk-gnutella
     SUBDIR += gtorrentviewer
     SUBDIR += jackett
     SUBDIR += jigdo
     SUBDIR += ktorrent
     SUBDIR += libbt
     SUBDIR += liberator
     SUBDIR += libktorrent
     SUBDIR += libswift
     SUBDIR += libtorrent
     SUBDIR += libtorrent-rasterbar
     SUBDIR += libtorrent-rasterbar2
     SUBDIR += libutp
     SUBDIR += lidarr
     SUBDIR += linuxdcpp
     SUBDIR += litecoin
     SUBDIR += litecoin-daemon
     SUBDIR += litecoin-utils
     SUBDIR += lxmf
     SUBDIR += microdc2
     SUBDIR += minder
     SUBDIR += mktorrent
     SUBDIR += mldonkey
     SUBDIR += mldonkey-core
     SUBDIR += mldonkey-gui
     SUBDIR += monero-cli
     SUBDIR += namecoin
     SUBDIR += namecoin-daemon
     SUBDIR += namecoin-utils
     SUBDIR += ncdc
     SUBDIR += nomadnet
     SUBDIR += ogmios
     SUBDIR += opendchub
     SUBDIR += oura
     SUBDIR += p5-Net-BitTorrent
     SUBDIR += p5-Net-BitTorrent-File
     SUBDIR += p5-Net-BitTorrent-PeerPacket
     SUBDIR += p5-Net-DirectConnect
     SUBDIR += p5-WWW-BitTorrent
     SUBDIR += phex
     SUBDIR += prowlarr
     SUBDIR += py-ed2k-tools
     SUBDIR += py-libtorrent-rasterbar
     SUBDIR += py-nicotine-plus
     SUBDIR += py-transmission-rpc
     SUBDIR += py-tremc
     SUBDIR += py-vertex
     SUBDIR += pyln-bolt7
     SUBDIR += pyln-client
     SUBDIR += pyln-proto
     SUBDIR += qbittorrent
     SUBDIR += radarr
     SUBDIR += readarr
     SUBDIR += reticulum
     SUBDIR += retroshare
     SUBDIR += rslsync
     SUBDIR += rtorrent
     SUBDIR += shx
     SUBDIR += sonarr
     SUBDIR += sonarr-devel
     SUBDIR += tooth
     SUBDIR += torrent-file-editor
     SUBDIR += torrentcheck
     SUBDIR += torrentsniff
     SUBDIR += transmission
     SUBDIR += transmission-components
     SUBDIR += transmission-remote-gui
     SUBDIR += tremotesf
     SUBDIR += twitch-tui
     SUBDIR += udpt
     SUBDIR += uhub
     SUBDIR += vuze
     SUBDIR += xbt
     SUBDIR += xmrig
 
 .include <bsd.port.subdir.mk>
diff --git a/net-p2p/clboss/Makefile b/net-p2p/clboss/Makefile
new file mode 100644
index 000000000000..da42b6bf238c
--- /dev/null
+++ b/net-p2p/clboss/Makefile
@@ -0,0 +1,43 @@
+PORTNAME=	clboss
+# To build from an arbitrary git commit comment PORTVERSION and PORTREVISION (if present)
+PORTVERSION=	0.13
+DISTVERSIONPREFIX=	v
+# and uncomment the following two lines (use for example -git-HEAD or -git-f8d8348c)
+#PORTVERSION=	0
+#PKGNAMESUFFIX=	-git-0673c50e7
+CATEGORIES=	net-p2p finance
+
+MAINTAINER=	vd@FreeBSD.org
+COMMENT=	The Core Lightning Node Manager
+WWW=		https://github.com/ZmnSCPxj/clboss
+
+LICENSE=	MIT
+
+BUILD_DEPENDS=	autoconf-archive>=0:devel/autoconf-archive
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libev.so:devel/libev
+RUN_DEPENDS=	lightningd:net-p2p/c-lightning
+
+USES=		autoreconf \
+		compiler:c11 \
+		gmake \
+		libtool \
+		pkgconfig \
+		sqlite:3
+
+CXXFLAGS=	-Wno-deprecated-declarations
+
+GNU_CONFIGURE=	yes
+
+USE_GITHUB=	yes
+.if defined(PKGNAMESUFFIX)
+GIT_COMMIT=	${PKGNAMESUFFIX:C/-git-//}
+.else
+GIT_COMMIT=	${DISTVERSIONPREFIX}${PORTVERSION}
+.endif
+GH_TUPLE=	ZmnSCPxj:clboss:${GIT_COMMIT}
+
+SUB_FILES=	pkg-message
+PLIST_FILES=	bin/clboss
+
+.include <bsd.port.mk>
diff --git a/net-p2p/clboss/distinfo b/net-p2p/clboss/distinfo
new file mode 100644
index 000000000000..851bbb3aff8a
--- /dev/null
+++ b/net-p2p/clboss/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1707722279
+SHA256 (ZmnSCPxj-clboss-v0.13_GH0.tar.gz) = 5eec4df9116159e56c86beeb80933a997afc5bc46eb18057f9fd670c81830ff4
+SIZE (ZmnSCPxj-clboss-v0.13_GH0.tar.gz) = 2947305
diff --git a/net-p2p/clboss/files/patch-Util_Compiler.hpp b/net-p2p/clboss/files/patch-Util_Compiler.hpp
new file mode 100644
index 000000000000..85e99d369ba9
--- /dev/null
+++ b/net-p2p/clboss/files/patch-Util_Compiler.hpp
@@ -0,0 +1,11 @@
+--- Util/Compiler.hpp.orig	2024-02-12 08:08:33 UTC
++++ Util/Compiler.hpp
+@@ -1,7 +1,7 @@
+ #ifndef COMPILER_H_
+ #define COMPILER_H_
+ 
+-#ifdef __GNUC__
++#if defined(__GNUC__) && !defined(__clang__)
+ #include <features.h>
+ // We need a GCC patch here due the following bug
+ // <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=107134>
diff --git a/net-p2p/clboss/files/pkg-message.in b/net-p2p/clboss/files/pkg-message.in
new file mode 100644
index 000000000000..1b0c704b7b7e
--- /dev/null
+++ b/net-p2p/clboss/files/pkg-message.in
@@ -0,0 +1,11 @@
+[
+{ type: install
+  message: <<EOM
+To enable CLBOSS in lightningd add the following line to %%PREFIX%%/etc/lightningd-bitcoin.conf:
+
+important-plugin=%%PREFIX%%/bin/clboss
+
+See https://github.com/ZmnSCPxj/clboss#operating for more information.
+EOM
+}
+]
diff --git a/net-p2p/clboss/pkg-descr b/net-p2p/clboss/pkg-descr
new file mode 100644
index 000000000000..c1b3b0b24e0a
--- /dev/null
+++ b/net-p2p/clboss/pkg-descr
@@ -0,0 +1,3 @@
+CLBOSS is an automated manager for Core Lightning forwarding nodes.
+CLBOSS is effectively a bunch of heuristics modules wired together to a
+regular clock to continuously monitor your node.