diff --git a/x11-fonts/font-manager/Makefile b/x11-fonts/font-manager/Makefile
index 5e85c418fcf2..e47fa54ee6f5 100644
--- a/x11-fonts/font-manager/Makefile
+++ b/x11-fonts/font-manager/Makefile
@@ -1,47 +1,46 @@
 # Created by: Zhihao Yuan <lichray@gmail.com>
 
 PORTNAME=	font-manager
 PORTVERSION=	0.8.5
 CATEGORIES=	x11-fonts gnome
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Font management application for the GNOME desktop
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	cmake:devel/cmake \
 		itstool:textproc/itstool \
-		ninja:devel/ninja \
 		valac:lang/vala \
 		yelp-build:textproc/yelp-tools
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libjson-glib-1.0.so:devel/json-glib \
 		libsoup-2.4.so:devel/libsoup \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk3
 
 USES=		compiler:c++11-lang desktop-file-utils gettext-tools gnome \
 		meson pkgconfig python:3.6+ shebangfix sqlite
 USE_GITHUB=	yes
 GH_ACCOUNT=	FontManager
 USE_GNOME=	cairo glib20 gtk30 libxml2 pango
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 
 SHEBANG_GLOB=	*.py
 
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext-runtime
 NLS_MESON_TRUE=	enable-nls
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e "s|\(find_installation.*\)python3|\1${PYTHON_CMD}|" \
 		${WRKSRC}/meson.build
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-manager/files/patch-lib_common_meson.build b/x11-fonts/font-manager/files/patch-lib_common_meson.build
new file mode 100644
index 000000000000..6f472efdb49e
--- /dev/null
+++ b/x11-fonts/font-manager/files/patch-lib_common_meson.build
@@ -0,0 +1,23 @@
+From 3ad5cc842b90614d8c06d4a4a7428b906a982aea Mon Sep 17 00:00:00 2001
+From: Jerry Casiano <JerryCasiano@gmail.com>
+Date: Wed, 24 Mar 2021 17:47:23 -0400
+Subject: [PATCH] - Proper fix for Issue #208
+
+--- lib/common/meson.build.orig	2021-03-22 22:35:30 UTC
++++ lib/common/meson.build
+@@ -71,7 +71,7 @@ common_vapi = gnome.generate_vapi('font-manager-common
+                                     sources: [
+                                         common_gir[0],
+                                         unicode_gir[0],
+-                                        'font-manager-common.vala'
++                                        'font-manager-common.vala',
+                                     ],
+                                     vapi_dirs: [
+                                         meson.current_build_dir(),
+@@ -87,5 +87,5 @@ common_vapi = gnome.generate_vapi('font-manager-common
+                                         'json-glib-1.0',
+                                         'libxml-2.0',
+                                         'sqlite3',
+-                                        'Unicode-@0@'.format(meson.project_version())
++                                        unicode_vapi
+                                     ])