diff --git a/misc/shared-mime-info/Makefile b/misc/shared-mime-info/Makefile
index bc81d9447691..a76c9a38c9a2 100644
--- a/misc/shared-mime-info/Makefile
+++ b/misc/shared-mime-info/Makefile
@@ -1,50 +1,50 @@
 # Created by: olgeni@FreeBSD.org
 
 PORTNAME=	shared-mime-info
 DISTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc gnome
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	MIME types database from the freedesktop.org project
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gmake:devel/gmake \
 		itstool:textproc/itstool \
 		minixmlto:textproc/minixmlto
 
 USES=		gettext gnome localbase meson pathfix pkgconfig shebangfix \
 		tar:xz trigger
 CONFIGURE_ARGS=	-Dupdate-mimedb=false \
 		-Dxdgmime-path=${WRKSRC}/src/xdgmime
 USE_GNOME=	glib20 libxml2
 USE_GITLAB=	YES
 GL_SITE=	https://gitlab.freedesktop.org/
 GL_ACCOUNT=	xdg
 GL_PROJECT=	shared-mime-info
 GL_COMMIT=	ef58b2b2f7ad4070171c6e45e3b3764daa3ff2c1
 GL_TUPLE=	xdg:xdgmime:6663a2288d11b37bc07f5a01b4b85dcd377787e1:xdgmime/src/xdgmime
 bash_CMD=	/bin/sh
 SHEBANG_FILES=	${WRKSRC}/data/freedesktop_generate.sh
 
 MIMESUBDIRS=	application audio image inode message model multipart \
 		packages text video x-epoc x-content font
 
 BINARY_ALIAS=	xmlto=minixmlto
 
 post-patch:
 	${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/src/xdgmime/src/xdgmime.c \
 		${WRKSRC}/src/update-mime-database.c
 
 pre-configure:
 	cd ${WRKSRC}/src/xdgmime/src && ${SETENV} ${MAKE_ENV} ${GMAKE}
 
 post-install:
 	for dir in ${MIMESUBDIRS} ; do \
 		${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/$${dir} ; \
 	done
 
 .include <bsd.port.mk>
diff --git a/misc/shared-mime-info/files/shared-mime-info.ucl.in b/misc/shared-mime-info/files/shared-mime-info.ucl.in
index 38d1d2cfec04..2049db0caa5e 100644
--- a/misc/shared-mime-info/files/shared-mime-info.ucl.in
+++ b/misc/shared-mime-info/files/shared-mime-info.ucl.in
@@ -1,27 +1,42 @@
 path: "%%PREFIX%%/share/mime/packages"
 cleanup: {
 	type: lua
 	script: <<EOS
 local mimedir = "%%PREFIX%%/share/mime/"
 local files = { "XMLnamespaces", "aliases", "generic-icons", "globs", "globs2", "icons", "mime.cache", "subclasses", "treemagic", "types", "version"}
-for _,filename in pairs(files) do
+for _,filename in ipairs(files) do
 	local fpath = mimedir .. filename
 	local st = pkg.stat(fpath)
 	if st then
 		os.remove(fpath)
 	end
 end
 local res = pkg.readdir(mimedir)
-if #res == 0 then
-	os.remove(mimedir)
+if res == nil then goto cleanmime end
+
+for _,dir in ipairs(res) do
+	if  dir == "packages" then goto continue end
+
+	local directory = mimedir .. "/" .. dir
+	local r = pkg.readdir(directory)
+	if r == nil then goto cleandir end
+	for _,file in ipairs(r) do
+		os.remove(directory .. "/" .. file)
+	end
+	::cleandir::
+	os.remove(directory)
+
+	::continue::
 end
+::cleanmime::
+os.remove(mimedir)
 EOS
 }
 trigger: {
 	type: lua
 	sandbox: false
 	script: <<EOS
 print("Building the Shared MIME-Info database cache")
 pkg.exec({"%%PREFIX%%/bin/update-mime-database", "%%PREFIX%%/share/mime"})
 EOS
 }