diff --git a/x11-wm/cosmic-comp/Makefile b/x11-wm/cosmic-comp/Makefile
index 6787f259fd6b..bd34c90252ca 100644
--- a/x11-wm/cosmic-comp/Makefile
+++ b/x11-wm/cosmic-comp/Makefile
@@ -1,50 +1,53 @@
 PORTNAME=	cosmic-comp
 PORTVERSION=	s20240208
 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-devel>0:x11-servers/xwayland-devel
 
 USES=		cargo gl
 USE_GITHUB=	yes
 USE_GL=		gbm
 GH_ACCOUNT=	pop-os
 GH_TAGNAME=	6a4bcb1
 GH_TUPLE=	pop-os:iced:0.4.2-1768-g6115280d:iced/../${WRKSRC_crate_iced:T}/iced
 CARGO_FEATURES=	--no-default-features # disable systemd
 PLIST_FILES=	bin/${PORTNAME} \
 		share/wayland-sessions/${PORTNAME:S/-comp//}.desktop \
 
 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
 # Respect PREFIX for system-wide config
 	@${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \
 		${WRKSRC}/src/config/mod.rs
 # /sys by default is a symlink to /usr/src/sys
 	@${REINPLACE_CMD} -e 's,/sys,${LINUXBASE}&,' \
 		${WRKSRC}/src/debug.rs
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 # Install extras similar to ${WRKSRC}/Makefile
 .for f in data/*.desktop
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PLIST_FILES:M*.${f:E}:H}
 	${INSTALL_DATA} ${WRKSRC}/${f} \
 		${STAGEDIR}${PREFIX}/${PLIST_FILES:M*.${f:E}}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/x11-wm/cosmic-comp/files/patch-Cargo.toml b/x11-wm/cosmic-comp/files/patch-Cargo.toml
deleted file mode 100644
index 51758a3b65a7..000000000000
--- a/x11-wm/cosmic-comp/files/patch-Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-===>   Updating Cargo.lock
-error: failed to resolve patches for `https://github.com/Smithay/smithay.git`
-
-Caused by:
-  patch for `smithay` in `https://github.com/Smithay/smithay.git` failed to resolve
-
-Caused by:
-  The patch location `https://github.com/smithay/smithay?rev=f1e7fc18a` does not appear to contain any packages matching the name `smithay`.
-*** Error code 101
-
---- Cargo.toml.orig	2024-02-07 20:40:23 UTC
-+++ Cargo.toml
-@@ -89,6 +89,3 @@ lto = "fat"
- 
- [profile.release]
- lto = "fat"
--
--[patch."https://github.com/Smithay/smithay.git"]
--smithay = { git = "https://github.com/smithay//smithay", rev = "3b3e07952e" }