diff --git a/net-p2p/c-lightning/Makefile b/net-p2p/c-lightning/Makefile
index 31b58d39f6e4..cca885dd25ca 100644
--- a/net-p2p/c-lightning/Makefile
+++ b/net-p2p/c-lightning/Makefile
@@ -1,75 +1,77 @@
 # Created by: Vasil Dimov <vd@FreeBSD.org>
 
 PORTNAME=	c-lightning
 # To build from an arbitrary git commit comment PORTVERSION and PORTREVISION (if present)
-PORTVERSION=	0.10.1
+PORTVERSION=	0.10.2
 DISTVERSIONPREFIX=	v
 # and uncomment the following two lines (use for example -git-HEAD or -git-f8d8348c)
 #PORTVERSION=	0
 #PKGNAMESUFFIX=	-git-f8d8348c
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	vd@FreeBSD.org
 COMMENT=	Lightning Network implementation in C
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mako>=1.0.14:textproc/py-mako@${PY_FLAVOR}
+BUILD_DEPENDS=	bash:shells/bash \
+		${PYTHON_PKGNAMEPREFIX}mako>=1.0.14:textproc/py-mako@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mrkd>=0.2.0_1:devel/py-mrkd@${PY_FLAVOR}
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libsodium.so:security/libsodium \
 		libsqlite3.so:databases/sqlite3
 RUN_DEPENDS=	bitcoin-cli:net-p2p/bitcoin-utils
 
 USES=		autoreconf:build compiler:c11 cpe gettext gmake libtool \
 		python:3.5+,build
 CPE_VENDOR=	elementsproject
 BINARY_ALIAS=	python=${PYTHON_CMD} python3=${PYTHON_CMD}
 ALL_TARGET=	default
 
 OPTIONS_DEFINE=		COMPATIBILITY DEVELOPER EXPERIMENTAL
 OPTIONS_RADIO=		TESTING
 OPTIONS_RADIO_TESTING=	ASAN VALGRIND
 
 COMPATIBILITY_CONFIGURE_ENABLE=	compat
 COMPATIBILITY_DESC=		Compatibility mode, good to disable to see if your software breaks
 DEVELOPER_CONFIGURE_ENABLE=	developer
 DEVELOPER_DESC=			Developer mode, good for testing
 EXPERIMENTAL_CONFIGURE_ENABLE=	experimental-features
 EXPERIMENTAL_DESC=		Enable experimental features
 ASAN_CONFIGURE_ENABLE=		address-sanitizer
 ASAN_DESC=			Compile with address-sanitizer
 VALGRIND_CONFIGURE_ENABLE=	valgrind
 VALGRIND_DESC=			Run tests with Valgrind
 
 OPTIONS_DEFAULT=COMPATIBILITY
 
 HAS_CONFIGURE=	yes
 
 USE_GITHUB=	yes
 .if defined(PKGNAMESUFFIX)
 GIT_COMMIT=	${PKGNAMESUFFIX:C/-git-//}
 .else
 GIT_COMMIT=	${DISTVERSIONPREFIX}${PORTVERSION}
 .endif
 GH_TUPLE=	ElementsProject:lightning:${GIT_COMMIT} \
 		ElementsProject:libwally-core:46a3db9b7bce9:ext1/external/libwally-core \
 		ElementsProject:secp256k1-zkp:6da00ec6245e1:ext2/external/libwally-core/src/secp256k1 \
 		ianlancetaylor:libbacktrace:5a99ff7fed66b8e:ext3/external/libbacktrace \
 		zserge:jsmn:18e9fe42cbfe21d65076f5c77ae2be3:ext4/external/jsmn \
 		valyala:gheap:67fc83bc953324f4759e52951921d:ext5/external/gheap
 
 USERS=		c-lightning
 GROUPS=		c-lightning
 
 USE_RC_SUBR=	lightningd
 
 SUB_FILES=	lightningd-bitcoin.conf.sample pkg-message
 SUB_LIST=	U="${USERS}" G="${GROUPS}" LIGHTNINGD_BASE_DIR="${DESTDIR}/var/db/c-lightning"
 PLIST_SUB=	U="${USERS}" G="${GROUPS}"
 
 post-install:
 	${INSTALL_DATA} \
 		${WRKDIR}/lightningd-bitcoin.conf.sample \
 		${STAGEDIR}${PREFIX}/etc/lightningd-bitcoin.conf.sample
 
 .include <bsd.port.mk>
diff --git a/net-p2p/c-lightning/distinfo b/net-p2p/c-lightning/distinfo
index ae5a0b8b935c..c4b3cc8482c6 100644
--- a/net-p2p/c-lightning/distinfo
+++ b/net-p2p/c-lightning/distinfo
@@ -1,13 +1,13 @@
-TIMESTAMP = 1628583597
-SHA256 (ElementsProject-lightning-v0.10.1_GH0.tar.gz) = c65e6b3091e374afb548775e1debb3881642371bce38573ad0d2b9a441577a4a
-SIZE (ElementsProject-lightning-v0.10.1_GH0.tar.gz) = 3744785
+TIMESTAMP = 1637567671
+SHA256 (ElementsProject-lightning-v0.10.2_GH0.tar.gz) = f90f16322af546208f3f62d2927aa8a771d3b4e527856ae183f2714d5cba3978
+SIZE (ElementsProject-lightning-v0.10.2_GH0.tar.gz) = 3701842
 SHA256 (ElementsProject-libwally-core-46a3db9b7bce9_GH0.tar.gz) = 9512bd6fc9d091d23d56d9f14a10c5d2a751ca825e80fa27aa71af4cc5cd7850
 SIZE (ElementsProject-libwally-core-46a3db9b7bce9_GH0.tar.gz) = 807769
 SHA256 (ElementsProject-secp256k1-zkp-6da00ec6245e1_GH0.tar.gz) = 74fbfa22607706f85e587a3828b69f820c3373c0bd9434e4126fbfa22962efec
 SIZE (ElementsProject-secp256k1-zkp-6da00ec6245e1_GH0.tar.gz) = 292067
 SHA256 (ianlancetaylor-libbacktrace-5a99ff7fed66b8e_GH0.tar.gz) = 2aad59f02cb008b5e912821c205ad6a140afcae69844e7ba9f7e590239ec41e2
 SIZE (ianlancetaylor-libbacktrace-5a99ff7fed66b8e_GH0.tar.gz) = 509368
 SHA256 (zserge-jsmn-18e9fe42cbfe21d65076f5c77ae2be3_GH0.tar.gz) = 2e90b8b42876f384ba229097cd9f8534250683abb135256843b538cb45dd907f
 SIZE (zserge-jsmn-18e9fe42cbfe21d65076f5c77ae2be3_GH0.tar.gz) = 11047
 SHA256 (valyala-gheap-67fc83bc953324f4759e52951921d_GH0.tar.gz) = b6f7a700cc2224ce04827d72cf78f7b2420b37b36b1f5ea7f9cfc98513cbf449
 SIZE (valyala-gheap-67fc83bc953324f4759e52951921d_GH0.tar.gz) = 25470
diff --git a/net-p2p/c-lightning/files/lightningd.in b/net-p2p/c-lightning/files/lightningd.in
index ba6916302540..043d8c43796e 100644
--- a/net-p2p/c-lightning/files/lightningd.in
+++ b/net-p2p/c-lightning/files/lightningd.in
@@ -1,92 +1,92 @@
 #!/bin/sh
 
 # PROVIDE: lightningd
 # REQUIRE: LOGIN bitcoind cleanvar
 # KEYWORD: shutdown
 
 # Add the following to %%LOCALBASE%%/etc/rc.conf.d/lightningd to influence
 # the behavior of this script (default values are listed):
 #
 # lightningd_enable="NO"  # change to "YES" to enable
 # lightningd_user="%%U%%"
 # lightningd_group="%%G%%"
 # lightningd_base_dir="%%LIGHTNINGD_BASE_DIR%%"
 # lightningd_network="bitcoin"
 # lightningd_conf="%%PREFIX%%/etc/lightningd-${lightningd_network}.conf"
 # lightningd_extra_args=""  # See lightningd --help
 
 . /etc/rc.subr
 
 name="lightningd"
 rcvar=lightningd_enable
 
 load_rc_config ${name}
 
 : ${lightningd_enable:="NO"}
 : ${lightningd_user:="%%U%%"}
 : ${lightningd_group:="%%G%%"}
 : ${lightningd_base_dir:="%%LIGHTNINGD_BASE_DIR%%"}
 : ${lightningd_network:="bitcoin"}
 : ${lightningd_conf:="%%PREFIX%%/etc/${name}-${lightningd_network}.conf"}
 
 start_precmd="lightningd_start_precmd"
 pidfile="${lightningd_base_dir}/lightningd-${lightningd_network}.pid"
 command="%%PREFIX%%/bin/lightningd"
 command_args=""
 command_args="${command_args} --lightning-dir=${lightningd_base_dir}"
 command_args="${command_args} --network=${lightningd_network}"
 command_args="${command_args} --daemon"
 # service(8) would execute us with LOCALBASE stripped out from PATH,
 # thus specify the full path to bitcoin-cli.
 command_args="${command_args} --bitcoin-cli=%%LOCALBASE%%/bin/bitcoin-cli"
 # bitcoin-cli(1) tries to create its "datadir" (by default ${HOME}/.bitcoin)
 # if it does not exist. Provide something that already exists to avoid the
 # creation of unnecessary empty directories.
 command_args="${command_args} --bitcoin-datadir=${lightningd_base_dir}"
 
 if [ -e "${lightningd_conf}" ] ; then
 	command_args="${command_args} --conf=${lightningd_conf}"
 fi
 
 command_args="${command_args} ${lightningd_extra_args}"
 
 check_bitcoind_ready()
 {
-    bitcoin-cli \
+    %%LOCALBASE%%/bin/bitcoin-cli \
         -rpcconnect=${bitcoin_addr}${bitcoin_port:+":"}${bitcoin_port} \
         -rpcuser=${bitcoin_user} \
         -stdinrpcpass \
         echo itworks <<PASS
 ${bitcoin_pass}
 PASS
 }
 
 lightningd_start_precmd()
 {
     # Wait for bitcoind to be fully operational. lightningd would quit (refuse
     # to start) if it can't talk to bitcoind via its RPC.
     bitcoin_addr="`grep ^bitcoin-rpcconnect= "${lightningd_conf}" |cut -f 2- -d =`"
     bitcoin_port="`grep ^bitcoin-rpcport= "${lightningd_conf}" |cut -f 2- -d =`"
     bitcoin_user="`grep ^bitcoin-rpcuser= "${lightningd_conf}" |cut -f 2- -d =`"
     bitcoin_pass="`grep ^bitcoin-rpcpassword= "${lightningd_conf}" |cut -f 2- -d =`"
 
     i=20
     while : ; do
         if [ $i -eq 0 ] ; then
             # Show errors from last attempt.
             if ! check_bitcoind_ready ; then
                 echo "Failed: bitcoind did not start serving RPC, starting lightningd anyway"
             fi
             break
         else
             if check_bitcoind_ready > /dev/null 2>&1; then
                 break
             fi
         fi
         echo "Waiting for bitcoind to start serving RPC, lightningd cannot start without it $i"
         sleep 1
         i=$((i - 1))
     done
 }
 
 run_rc_command "$1"
diff --git a/net-p2p/c-lightning/pkg-plist b/net-p2p/c-lightning/pkg-plist
index 19c87101eb2e..138e266a2816 100644
--- a/net-p2p/c-lightning/pkg-plist
+++ b/net-p2p/c-lightning/pkg-plist
@@ -1,107 +1,111 @@
 @sample(%%U%%,%%G%%,0400) etc/lightningd-bitcoin.conf.sample
 bin/lightning-cli
 bin/lightning-hsmtool
 bin/lightningd
 libexec/c-lightning/lightning_channeld
 libexec/c-lightning/lightning_closingd
 libexec/c-lightning/lightning_connectd
 libexec/c-lightning/lightning_dualopend
 libexec/c-lightning/lightning_gossipd
 libexec/c-lightning/lightning_hsmd
 libexec/c-lightning/lightning_onchaind
 libexec/c-lightning/lightning_openingd
+libexec/c-lightning/lightning_websocketd
 libexec/c-lightning/plugins/autoclean
 libexec/c-lightning/plugins/bcli
 libexec/c-lightning/plugins/fetchinvoice
 libexec/c-lightning/plugins/funder
 libexec/c-lightning/plugins/keysend
 libexec/c-lightning/plugins/offers
 libexec/c-lightning/plugins/pay
 libexec/c-lightning/plugins/spenderp
 libexec/c-lightning/plugins/topology
 libexec/c-lightning/plugins/txprepare
 man/man1/lightning-cli.1.gz
 man/man5/lightningd-config.5.gz
 man/man7/lightning-addgossip.7.gz
 man/man7/lightning-autocleaninvoice.7.gz
 man/man7/lightning-check.7.gz
 man/man7/lightning-checkmessage.7.gz
 man/man7/lightning-close.7.gz
 man/man7/lightning-connect.7.gz
 man/man7/lightning-createinvoice.7.gz
 man/man7/lightning-createonion.7.gz
+man/man7/lightning-datastore.7.gz
 man/man7/lightning-decode.7.gz
 man/man7/lightning-decodepay.7.gz
+man/man7/lightning-deldatastore.7.gz
 man/man7/lightning-delexpiredinvoice.7.gz
 man/man7/lightning-delinvoice.7.gz
 man/man7/lightning-delpay.7.gz
 man/man7/lightning-disableoffer.7.gz
 man/man7/lightning-disconnect.7.gz
 man/man7/lightning-feerates.7.gz
 man/man7/lightning-fetchinvoice.7.gz
 man/man7/lightning-fundchannel.7.gz
 man/man7/lightning-fundchannel_cancel.7.gz
 man/man7/lightning-fundchannel_complete.7.gz
 man/man7/lightning-fundchannel_start.7.gz
 man/man7/lightning-funderupdate.7.gz
 man/man7/lightning-fundpsbt.7.gz
 man/man7/lightning-getinfo.7.gz
 man/man7/lightning-getlog.7.gz
 man/man7/lightning-getroute.7.gz
 man/man7/lightning-getsharedsecret.7.gz
 man/man7/lightning-help.7.gz
 man/man7/lightning-invoice.7.gz
 man/man7/lightning-keysend.7.gz
 man/man7/lightning-listchannels.7.gz
 man/man7/lightning-listconfigs.7.gz
+man/man7/lightning-listdatastore.7.gz
 man/man7/lightning-listforwards.7.gz
 man/man7/lightning-listfunds.7.gz
 man/man7/lightning-listinvoices.7.gz
 man/man7/lightning-listnodes.7.gz
 man/man7/lightning-listoffers.7.gz
 man/man7/lightning-listpays.7.gz
 man/man7/lightning-listpeers.7.gz
 man/man7/lightning-listsendpays.7.gz
 man/man7/lightning-listtransactions.7.gz
 man/man7/lightning-multifundchannel.7.gz
 man/man7/lightning-multiwithdraw.7.gz
 man/man7/lightning-newaddr.7.gz
 man/man7/lightning-notifications.7.gz
 man/man7/lightning-offer.7.gz
 man/man7/lightning-offerout.7.gz
 man/man7/lightning-openchannel_abort.7.gz
 man/man7/lightning-openchannel_bump.7.gz
 man/man7/lightning-openchannel_init.7.gz
 man/man7/lightning-openchannel_signed.7.gz
 man/man7/lightning-openchannel_update.7.gz
 man/man7/lightning-parsefeerate.7.gz
 man/man7/lightning-pay.7.gz
 man/man7/lightning-ping.7.gz
 man/man7/lightning-plugin.7.gz
 man/man7/lightning-reserveinputs.7.gz
 man/man7/lightning-sendcustommsg.7.gz
 man/man7/lightning-sendinvoice.7.gz
 man/man7/lightning-sendonion.7.gz
 man/man7/lightning-sendonionmessage.7.gz
 man/man7/lightning-sendpay.7.gz
 man/man7/lightning-sendpsbt.7.gz
 man/man7/lightning-setchannelfee.7.gz
 man/man7/lightning-signmessage.7.gz
 man/man7/lightning-signpsbt.7.gz
 man/man7/lightning-stop.7.gz
 man/man7/lightning-txdiscard.7.gz
 man/man7/lightning-txprepare.7.gz
 man/man7/lightning-txsend.7.gz
 man/man7/lightning-unreserveinputs.7.gz
 man/man7/lightning-utxopsbt.7.gz
 man/man7/lightning-waitanyinvoice.7.gz
 man/man7/lightning-waitblockheight.7.gz
 man/man7/lightning-waitinvoice.7.gz
 man/man7/lightning-waitsendpay.7.gz
 man/man7/lightning-withdraw.7.gz
 man/man8/lightning-hsmtool.8.gz
 man/man8/lightningd.8.gz
 share/doc/c-lightning/HACKING.md
 share/doc/c-lightning/INSTALL.md
 share/doc/c-lightning/LICENSE
 share/doc/c-lightning/README.md