diff --git a/x11-wm/cosmic-comp/Makefile b/x11-wm/cosmic-comp/Makefile
index fbcd1f68e437..67a600c425d9 100644
--- a/x11-wm/cosmic-comp/Makefile
+++ b/x11-wm/cosmic-comp/Makefile
@@ -1,58 +1,59 @@
 PORTNAME=	cosmic-comp
 DISTVERSIONPREFIX=	epoch-
 DISTVERSION=	1.0.0-alpha.4
+PORTREVISION=	1
 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
 
 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-no-systemd b/x11-wm/cosmic-comp/files/patch-no-systemd
index ac2a59551579..ad3699dbe259 100644
--- a/x11-wm/cosmic-comp/files/patch-no-systemd
+++ b/x11-wm/cosmic-comp/files/patch-no-systemd
@@ -1,28 +1,28 @@
 Avoid various systemd dependencies
 
 --- data/cosmic.desktop.orig	2024-01-29 00:48:40 UTC
 +++ data/cosmic.desktop
 @@ -1,7 +1,7 @@ Commment=This session logs you into Cosmic
  [Desktop Entry]
  Name=Cosmic
  Commment=This session logs you into Cosmic
 -Exec=/usr/bin/cosmic-service
 +Exec=cosmic-comp
  Type=Application
  DesktopNames=pop:COSMIC
  X-GDM-SessionRegisters=false
 \ No newline at end of file
 --- src/main.rs.orig	2024-09-23 09:13:21 UTC
 +++ src/main.rs
 @@ -87,6 +87,11 @@ fn main() -> Result<()> {
      logger::init_logger()?;
      info!("Cosmic starting up!");
  
 +    // Advise xdg-desktop-portal which *-portals.conf to load
-+    std::env::set_var("XDG_CURRENT_DESKTOP", "cosmic");
++    std::env::set_var("XDG_CURRENT_DESKTOP", "COSMIC");
 +    // Mimic wlroots, used by https://github.com/qt/qtbase/commit/4b4870a12cd9
 +    std::env::set_var("XDG_SESSION_TYPE", "wayland");
 +
      #[cfg(feature = "profile-with-tracy")]
      profiling::tracy_client::Client::start();
      profiling::register_thread!("Main Thread");