diff --git a/textproc/cmark/Makefile b/textproc/cmark/Makefile
index 0f9c912ef48c..9fcb4977160a 100644
--- a/textproc/cmark/Makefile
+++ b/textproc/cmark/Makefile
@@ -1,23 +1,21 @@
 PORTNAME=	cmark
 DISTVERSION=	0.30.2
 CATEGORIES=	textproc
 
 MAINTAINER=	adridg@FreeBSD.org
 COMMENT=	CommonMark parsing and rendering library and program in C
 WWW=		https://github.com/commonmark/cmark
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cmake python:test
 USE_GITHUB=	yes
 GH_ACCOUNT=	commonmark
 USE_LDCONFIG=	yes
 
-CONFLICTS_INSTALL=	 py*-CommonMark # bin/cmark
-
 CMAKE_ARGS=	-DCMAKE_INSTALL_LIBDIR:STRING="lib"
 PLIST_SUB=	VERSION=${PORTVERSION}
 TEST_TARGET=	test
 
 .include <bsd.port.mk>
diff --git a/textproc/py-CommonMark/Makefile b/textproc/py-CommonMark/Makefile
index a6ef2128e115..1889c819e234 100644
--- a/textproc/py-CommonMark/Makefile
+++ b/textproc/py-CommonMark/Makefile
@@ -1,24 +1,23 @@
 PORTNAME=	CommonMark
 PORTVERSION=	0.9.1
+PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	commonmark-${PORTVERSION}
 
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	Python parser for the CommonMark Markdown spec
 WWW=		https://github.com/rtfd/CommonMark-py
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR}
 
-CONFLICTS_INSTALL=	cmark
-
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-CommonMark/files/patch-setup.py b/textproc/py-CommonMark/files/patch-setup.py
new file mode 100644
index 000000000000..27857d162967
--- /dev/null
+++ b/textproc/py-CommonMark/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	2023-11-11 01:20:49 UTC
++++ setup.py
+@@ -48,7 +48,7 @@ setup(
+     keywords=["markup", "markdown", "commonmark"],
+     entry_points={
+         'console_scripts': [
+-            'cmark = commonmark.cmark:main',
++            'cmark-py = commonmark.cmark:main',
+         ]
+     },
+     cmdclass={'test': Test},