diff --git a/x11-wm/cosmic-comp/Makefile b/x11-wm/cosmic-comp/Makefile
index 67a600c425d9..8532951833e7 100644
--- a/x11-wm/cosmic-comp/Makefile
+++ b/x11-wm/cosmic-comp/Makefile
@@ -1,59 +1,63 @@
 PORTNAME=	cosmic-comp
 DISTVERSIONPREFIX=	epoch-
 DISTVERSION=	1.0.0-alpha.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Compositor for the COSMIC desktop environment
 WWW=		https://github.com/pop-os/cosmic-comp
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libudev.so:devel/libudev-devd \
 		libseat.so:sysutils/seatd \
 		libinput.so:x11/libinput \
 		libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=	mesa-dri>0:graphics/mesa-dri \
 		vulkan-loader>0:graphics/vulkan-loader \
 		Xwayland:x11-servers/xwayland
 
 USES=		cargo gl xorg
 USE_GITHUB=	yes
 USE_GL=		gbm
 USE_XORG=	pixman
 GH_ACCOUNT=	pop-os
 GH_TUPLE=	pop-os:iced:0.4.2-2018-gb645ecac:iced/../${WRKSRC_crate_iced:T}/iced
 CARGO_FEATURES=	--no-default-features # disable systemd
 PLIST_FILES=	bin/${PORTNAME} \
 		share/cosmic/com.system76.CosmicSettings.Shortcuts/v1/defaults/keybindings.ron \
 		share/cosmic/com.system76.CosmicSettings.WindowRules/v1/tiling_exception_defaults/tiling-exceptions.ron \
 		share/wayland-sessions/${PORTNAME:S/-comp//}.desktop \
 
 .if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH:Marmv?}
 # https://github.com/rust-lang/rust/issues/85598
 LTO_UNSAFE=	yes
 CARGO_ENV+=	CARGO_PROFILE_RELEASE_LTO=false
 .endif
 
 post-patch:
 # XXX Strip double / to help "make cargo-crates"
 	@${REINPLACE_CMD} -e 's,\(smithay\)//,\1/,' \
 		${WRKSRC}/Cargo.lock
 # XXX Drop [patch.<url>] section to help "make cargo-configure"
 	@${REINPLACE_CMD} -e '/\[patch/,$$d' \
 		${WRKSRC}/Cargo.toml
 # /sys by default is a symlink to /usr/src/sys
 	@${REINPLACE_CMD} -e 's,/sys,${LINUXBASE}&,' \
 		${WRKSRC}/src/debug.rs
+# https://github.com/RazrFalcon/fontdb/issues/61
+	@${REINPLACE_CMD} -e 's,/usr/share,${DATADIR:H},' \
+		-e 's,/etc,${LOCALBASE}&,' \
+		${WRKSRC_crate_fontdb}/src/lib.rs
 
 post-install:
 # Install extras similar to ${WRKSRC}/Makefile
 .for f in ${PLIST_FILES:Nbin/*:T:S,^,data/,}
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PLIST_FILES:M*${f:T}:H}
 	${INSTALL_DATA} ${WRKSRC}/${f} \
 		${STAGEDIR}${PREFIX}/${PLIST_FILES:M*${f:T}}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/x11-wm/cosmic-comp/files/patch-cosmic-text b/x11-wm/cosmic-comp/files/patch-cosmic-text
new file mode 100644
index 000000000000..f24b06127f14
--- /dev/null
+++ b/x11-wm/cosmic-comp/files/patch-cosmic-text
@@ -0,0 +1,22 @@
+https://github.com/pop-os/cosmic-text/pull/336
+
+--- ../cosmic-text-4fe90bb6126c22f589b46768d7754d65ae300c5e/src/font/fallback/mod.rs.orig	2024-09-23 13:53:29 UTC
++++ ../cosmic-text-4fe90bb6126c22f589b46768d7754d65ae300c5e/src/font/fallback/mod.rs
+@@ -9,7 +9,7 @@ use self::platform::*;
+ 
+ use self::platform::*;
+ 
+-#[cfg(not(any(target_os = "linux", target_os = "macos", target_os = "windows",)))]
++#[cfg(not(any(unix, target_os = "windows")))]
+ #[path = "other.rs"]
+ mod platform;
+ 
+@@ -17,7 +17,7 @@ mod platform;
+ #[path = "macos.rs"]
+ mod platform;
+ 
+-#[cfg(target_os = "linux")]
++#[cfg(all(unix, not(any(target_os = "android", target_os = "macos"))))]
+ #[path = "unix.rs"]
+ mod platform;
+