diff --git a/net/cloud-init/Makefile b/net/cloud-init/Makefile
index 6e805c9172e6..e509e51d1535 100644
--- a/net/cloud-init/Makefile
+++ b/net/cloud-init/Makefile
@@ -1,54 +1,49 @@
 # $FreeBSD$
 
 PORTNAME=	cloud-init
-PORTVERSION=	20.3
-PORTREVISION=	1
+PORTVERSION=	20.4
 CATEGORIES=	net python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	andrey@bsdnir.info
 COMMENT=	Init scripts for use on cloud images
 
 LICENSE=	APACHE20 GPLv3
 LICENSE_COMB=	dual
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-Apache2.0
 LICENSE_FILE_GPLv3=	${WRKSRC}/LICENSE-GPLv3
 
-ONLY_FOR_ARCHS=		amd64 i386
-ONLY_FOR_ARCHS_REASON=	currently depends on dmidecode which is x86-only
-
-RUN_DEPENDS=	dmidecode>0:sysutils/dmidecode \
-		sudo>0:security/sudo \
+RUN_DEPENDS=	sudo>0:security/sudo \
 		${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${PY_FLAVOR}
 
 USES=		python:3.6+ shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	canonical
 
 SHEBANG_FILES=	tools/validate-yaml.py tools/read-dependencies \
 		tools/read-version
 USE_PYTHON=	autoplist distutils
 ETCDIR=		${PREFIX}/etc/cloud
 
 PYDISTUTILS_INSTALLARGS+=	"--init-system=sysvinit_freebsd"
 
 NO_ARCH=	yes
 
 post-patch:
 	${REINPLACE_CMD} -e 's|"etc"|"${STAGEDIR}${PREFIX}/etc"|g' ${WRKSRC}/setup.py
 	${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/cloudinit/settings.py
 	@${RM} ${WRKSRC}/sysvinit/freebsd/*.orig
 
 post-build:
 	@cd ${WRKSRC} && ${MV} config/cloud.cfg.d/05_logging.cfg config/cloud.cfg.d/05_logging.cfg.sample
 
 .include <bsd.port.mk>
diff --git a/net/cloud-init/distinfo b/net/cloud-init/distinfo
index 251dadf433d5..a28177f36b93 100644
--- a/net/cloud-init/distinfo
+++ b/net/cloud-init/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1599320213
-SHA256 (canonical-cloud-init-20.3_GH0.tar.gz) = a0ddf894895b0450e963dd56d49e6ed9565eedef105de78d79f13b97c7062a91
-SIZE (canonical-cloud-init-20.3_GH0.tar.gz) = 1179033
+TIMESTAMP = 1606245571
+SHA256 (canonical-cloud-init-20.4_GH0.tar.gz) = 15c26e74d0c8135230a4087c60b0aced7b909949a6bf4fce31351bd0f6702559
+SIZE (canonical-cloud-init-20.4_GH0.tar.gz) = 1240893
diff --git a/net/cloud-init/files/patch-cloudinit_config_cc__resizefs.py b/net/cloud-init/files/patch-cloudinit_config_cc__resizefs.py
deleted file mode 100644
index b90f61cc34e8..000000000000
--- a/net/cloud-init/files/patch-cloudinit_config_cc__resizefs.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- cloudinit/config/cc_resizefs.py.orig	2020-10-29 12:41:28 UTC
-+++ cloudinit/config/cc_resizefs.py
-@@ -110,7 +110,7 @@ def _can_skip_resize_ufs(mount_point, devpth):
-     for line in dumpfs_res.splitlines():
-         if not line.startswith('#'):
-             newfs_cmd = shlex.split(line)
--            opt_value = 'O:Ua:s:b:d:e:f:g:h:i:jk:m:o:L:'
-+            opt_value = 'O:Ua:s:b:d:e:f:g:h:i:jk:l:m:o:t:L:'
-             optlist, _args = getopt.getopt(newfs_cmd[1:], opt_value)
-             for o, a in optlist:
-                 if o == "-s":
diff --git a/net/cloud-init/files/patch-cloudinit_util.py b/net/cloud-init/files/patch-cloudinit_util.py
deleted file mode 100644
index cae641a1ef1e..000000000000
--- a/net/cloud-init/files/patch-cloudinit_util.py
+++ /dev/null
@@ -1,16 +0,0 @@
---- cloudinit/util.py.orig	2020-10-29 12:40:41 UTC
-+++ cloudinit/util.py
-@@ -1652,10 +1652,12 @@ def mount_cb(device, callback, data=None, mtype=None,
-             mtypes = ["auto"]
-     elif platsys.endswith("bsd"):
-         if mtypes is None:
--            mtypes = ['ufs', 'cd9660', 'vfat']
-+            mtypes = ['ufs', 'cd9660', 'msdos']
-         for index, mtype in enumerate(mtypes):
-             if mtype == "iso9660":
-                 mtypes[index] = "cd9660"
-+            if mtype in ["vfat", "msdosfs", "msdos"]:
-+                mtypes[index] = "msdos"
-     else:
-         # we cannot do a smart "auto", so just call 'mount' once with no -t
-         mtypes = ['']