diff --git a/GIDs b/GIDs
index f1359bc682d4..f43a37800881 100644
--- a/GIDs
+++ b/GIDs
@@ -232,7 +232,7 @@ victoria-metrics:*:289:
 _gmid:*:290:
 pydio:*:291:
 sftpgo:*:292:
-# free: 293
+jottad:*:293:
 # free: 294
 # free: 295
 # free: 296
diff --git a/UIDs b/UIDs
index 815a01dad862..2a77da3c6886 100644
--- a/UIDs
+++ b/UIDs
@@ -237,7 +237,7 @@ victoria-metrics:*:289:289::0:0:VictoriaMetrics user:/nonexistent:/usr/sbin/nolo
 _gmid:*:290:290::0:0:gmid daemon user:/var/empty:/usr/sbin/nologin
 pydio:*:291:291::0:0:pydio cells user:/var/pydio:/bin/sh
 sftpgo:*:292:292::0:0:SFTPGo user:/nonexistent:/usr/sbin/nologin
-# free: 293
+jottad:*:293:293::0:0:Jotta Cloud Daemon:/nonexisten:/usr/sbin/nologin
 # free: 294
 # free: 295
 # free: 296
diff --git a/net/jotta-cli/Makefile b/net/jotta-cli/Makefile
new file mode 100644
index 000000000000..35f36a5e4a31
--- /dev/null
+++ b/net/jotta-cli/Makefile
@@ -0,0 +1,41 @@
+# Created by: Trenton Schulz <trueos@norwegianrockcat.com>
+
+PORTNAME=	jotta-cli
+PORTVERSION=	0.11.44593
+CATEGORIES=	net
+MASTER_SITES=	https://repo.jotta.us/archives/freebsd/${ARCH:S|amd64|amd64|:S|i386|386|}/
+DISTNAME=	${PORTNAME}-${PORTVERSION}_freebsd_${ARCH:S|amd64|amd64|:S|i386|386|}
+
+MAINTAINER=	trueos@norwegianrockcat.com
+COMMENT=	Jotta Cloud Daemon and Command-Line Interface
+
+LICENSE=	UNKNOWN
+LICENSE_NAME=	"Jottacloud Terms and Service"
+LICENSE_TEXT=	"JottaCloud has its own terms and conditions available at https://www.jottacloud.com/en/terms.html"
+LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
+
+ONLY_FOR_ARCHS=	amd64 i386
+RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
+
+RESTRICTED=	yes
+USERS=	jottad
+GROUPS=	jottad
+
+NO_BUILD=	yes
+
+USE_RC_SUBR=	jottad
+
+SUB_FILES=	pkg-message \
+		jottad
+
+do-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/jottad
+	${INSTALL_SCRIPT} ${WRKDIR}/jottad ${STAGEDIR}${PREFIX}/etc/rc.d/jottad
+	${INSTALL_PROGRAM} ${WRKDIR}/usr/bin/jotta-cli ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKDIR}/usr/bin/jottad ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_DATA} ${WRKDIR}/etc/jottad/config.ini ${STAGEDIR}${PREFIX}/etc/jottad/config.ini.sample
+
+post-install:
+	${MKDIR} ${STAGEDIR}/var/lib/jottad
+
+.include <bsd.port.mk>
diff --git a/net/jotta-cli/distinfo b/net/jotta-cli/distinfo
new file mode 100644
index 000000000000..300db948ed84
--- /dev/null
+++ b/net/jotta-cli/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1624294110
+SHA256 (jotta-cli-0.11.44593_freebsd_amd64.tar.gz) = d8e0ca6619cca4669556e35577601e88009a3993fc3e82009993e218fe4b4c9e
+SIZE (jotta-cli-0.11.44593_freebsd_amd64.tar.gz) = 11731054
diff --git a/net/jotta-cli/files/jottad.in b/net/jotta-cli/files/jottad.in
new file mode 100755
index 000000000000..847f5f736f14
--- /dev/null
+++ b/net/jotta-cli/files/jottad.in
@@ -0,0 +1,18 @@
+#!/bin/sh
+# PROVIDE: jottad
+# REQUIRE: DAEMON FILESYSTEMS netif
+# KEYWORD:
+
+# Heavily copied from user gt2416 on the FreeNAS forums
+# Thread: https://www.ixsystems.com/community/threads/jottacloud-install-guide.69086/
+
+. /etc/rc.subr
+
+name=jottad
+jottad_user=jottad
+rcvar=jottad_enable
+command_args="datadir %%PREFIX%%/etc/jottad &"
+command="%%PREFIX%%/sbin/${name}"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/net/jotta-cli/files/pkg-message.in b/net/jotta-cli/files/pkg-message.in
new file mode 100644
index 000000000000..5c15e445a4ec
--- /dev/null
+++ b/net/jotta-cli/files/pkg-message.in
@@ -0,0 +1,17 @@
+[
+{ type: install
+  message: <<EOM
+To use the Jottacloud CLI, you must first start the jottad
+
+# service jottad onestart
+
+You can make this happen at start up by setting the jottad_enable variable.
+
+# sysrc jottad_enable=YES
+
+Instructions for using the Jottacloud CLI is available at:
+
+  https://docs.jottacloud.com/en/articles/1437248-login-and-basic-use-with-jottacloud-cli
+
+}
+]
diff --git a/net/jotta-cli/pkg-descr b/net/jotta-cli/pkg-descr
new file mode 100644
index 000000000000..b24472f33039
--- /dev/null
+++ b/net/jotta-cli/pkg-descr
@@ -0,0 +1,23 @@
+From the Jottacloud website:
+
+The Jottacloud Command-line Tool or Command-line Client is a
+Command-line tool for Jottacloud users.
+
+The command-line client (CLI) is capable of running on most devices
+with Windows, OS X and linux systems such as desktops, servers, NAS
+devices, and even Raspberry Pi.
+
+Note: The command-line client a special software designed for running
+on servers or headless systems. It is not meant to control the
+Jottacloud Desktop Client.
+
+Features
+
+* Automatic folder backup
+* Archive files
+* Custom scan interval
+* Ignore files and folders with simple gitignore style pattern
+* Simple webhooks
+* Manage remote hosts
+
+WWW: http://www.jottacloud.com
diff --git a/net/jotta-cli/pkg-plist b/net/jotta-cli/pkg-plist
new file mode 100644
index 000000000000..d1d4447d456d
--- /dev/null
+++ b/net/jotta-cli/pkg-plist
@@ -0,0 +1,8 @@
+bin/jotta-cli
+sbin/jottad
+@dir etc/rc.d
+@owner jottad
+@group jottad
+@sample(jottad,jottad,644) etc/jottad/config.ini.sample
+@dir /var/lib/jottad
+@dir /var/lib