diff --git a/sysutils/Makefile b/sysutils/Makefile
index b2019a0ff14d..3c7dfe366ae3 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -368,6 +368,7 @@
     SUBDIR += filevercmp
     SUBDIR += filewatcherd
     SUBDIR += finfo
+    SUBDIR += firstboot-cloudsetup
     SUBDIR += firstboot-freebsd-update
     SUBDIR += firstboot-growfs
     SUBDIR += firstboot-pkgs
diff --git a/sysutils/firstboot-cloudsetup/Makefile b/sysutils/firstboot-cloudsetup/Makefile
new file mode 100644
index 000000000000..5d6539c0fdcc
--- /dev/null
+++ b/sysutils/firstboot-cloudsetup/Makefile
@@ -0,0 +1,20 @@
+PORTNAME=	cloudsetup
+PORTVERSION=	1.0
+CATEGORIES=	sysutils
+MASTER_SITES=	https://git.sr.ht/~jornane/${PORTNAME}/archive/
+PKGNAMEPREFIX=	firstboot-
+
+MAINTAINER=	jornane@icloud.com
+COMMENT=	Configure network and user when the system first boots
+
+LICENSE=	BSD3CLAUSE
+
+WRKSRC=		work/${PORTNAME}-${DISTNAME}
+NO_BUILD=	yes
+NO_ARCH=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e "s,/usr/local,${PREFIX},g" \
+		${WRKSRC}/firstboot_cloudsetup.rc
+
+.include <bsd.port.mk>
diff --git a/sysutils/firstboot-cloudsetup/distinfo b/sysutils/firstboot-cloudsetup/distinfo
new file mode 100644
index 000000000000..7d0c06dde937
--- /dev/null
+++ b/sysutils/firstboot-cloudsetup/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1653658894
+SHA256 (cloudsetup-1.0.tar.gz) = b13c1bb680b741116ec830bfad7b09d01f6dec014b37dda2e2d5f3351ccf07e6
+SIZE (cloudsetup-1.0.tar.gz) = 6805
diff --git a/sysutils/firstboot-cloudsetup/pkg-descr b/sysutils/firstboot-cloudsetup/pkg-descr
new file mode 100644
index 000000000000..e73cc9a11b6f
--- /dev/null
+++ b/sysutils/firstboot-cloudsetup/pkg-descr
@@ -0,0 +1,5 @@
+Configure network and user data from cloud configuration at first boot.
+The configuration is written before the netif service is started.
+Compatible with OpenNebula.
+
+WWW:	https://git.sr.ht/~jornane/${PORTNAME}
diff --git a/sysutils/firstboot-cloudsetup/pkg-plist b/sysutils/firstboot-cloudsetup/pkg-plist
new file mode 100644
index 000000000000..0cd35542b2f6
--- /dev/null
+++ b/sysutils/firstboot-cloudsetup/pkg-plist
@@ -0,0 +1,10 @@
+etc/rc.d/firstboot_cloudsetup
+sbin/cloudsetup
+%%DATADIR%%/cloudsetup-network
+%%DATADIR%%/cloudsetup-user
+%%DATADIR%%/functions.sh
+%%DATADIR%%/netconf-network.sh
+%%DATADIR%%/netconf-resolv.sh
+%%DATADIR%%/netconf-routing.sh
+%%DATADIR%%/show-context.sh
+%%DATADIR%%/userconf-sshkey.sh