diff --git a/net-mgmt/netdata/Makefile b/net-mgmt/netdata/Makefile
--- a/net-mgmt/netdata/Makefile
+++ b/net-mgmt/netdata/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	netdata
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.36.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ \
 		https://github.com/forkbomb9/netdata/commit/:dashboard
@@ -51,7 +51,7 @@
 		NETDATA_PERST=${NETDATA_PERST}
 
 OPTIONS_DEFINE=		CLOUD CUPS DBENGINE FREEIPMI GOPLUGIN LTO
-OPTIONS_DEFAULT=	DBENGINE LTO
+OPTIONS_DEFAULT=	CLOUD DBENGINE LTO
 OPTIONS_EXCLUDE_powerpc64=	LTO
 OPTIONS_EXCLUDE_riscv64=	LTO
 OPTIONS_SUB=		YES
diff --git a/net-mgmt/netdata/pkg-message b/net-mgmt/netdata/pkg-message
--- a/net-mgmt/netdata/pkg-message
+++ b/net-mgmt/netdata/pkg-message
@@ -6,6 +6,8 @@
 1. sysrc netdata_enable="YES"
 2. service netdata start
 3. Go to http://localhost:19999/
+4. <Optional> Connect to Netdata Cloud using the netdata-claim.sh script:
+   https://learn.netdata.cloud/docs/agent/claim#claiming-script
 EOM
 }
 ]