diff --git a/graphics/heimer/Makefile b/graphics/heimer/Makefile
index a09b1f5fdc6c..14cf1c4a66df 100644
--- a/graphics/heimer/Makefile
+++ b/graphics/heimer/Makefile
@@ -1,45 +1,49 @@
 PORTNAME=	heimer
 DISTVERSION=	3.6.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/juzzlin/Heimer/releases/download/${DISTVERSION}/
 
+PATCH_SITES=	https://github.com/juzzlin/Heimer/commit/
+PATCHFILES=	362882348743b360825fa95b690c05a21078a184.patch:-p1 # https://github.com/juzzlin/Heimer/pull/223
+
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Simple mind map, diagram, and note-taking tool
 WWW=		https://github.com/juzzlin/Heimer
 
 LICENSE=	CC-BY-SA-3.0 GPLv3+
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYING
 
 USES=		cmake:testing compiler:c++17-lang desktop-file-utils qt:5
 USE_QT=		core gui network svg widgets xml buildtools:build \
 		linguisttools:build qmake:build testlib:build
 
 PLIST_FILES=	bin/heimer \
 		share/applications/heimer.desktop \
 		share/icons/hicolor/256x256/apps/heimer.png \
 		share/metainfo/heimer.appdata.xml \
 		share/pixmaps/heimer.png
 
 PORTDOCS=	README.md
 PORTEXAMPLES=	examples/*.alz
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 EXAMPLES_PLIST_FILES=	${EXAMPLESDIR}/Company.alz \
 			${EXAMPLESDIR}/Family.alz \
 			${EXAMPLESDIR}/Heimer.alz \
 			${EXAMPLESDIR}/Large.alz
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/heimer
 
 .include <bsd.port.mk>
diff --git a/graphics/heimer/distinfo b/graphics/heimer/distinfo
index ed31e75ae87a..c4585457168c 100644
--- a/graphics/heimer/distinfo
+++ b/graphics/heimer/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1663788092
+TIMESTAMP = 1663846679
 SHA256 (heimer-3.6.1.tar.gz) = 55b44a518cd34059e2df50ba4e881029c7963872d5c7a1cff6efa68bd92b2108
 SIZE (heimer-3.6.1.tar.gz) = 1441252
+SHA256 (362882348743b360825fa95b690c05a21078a184.patch) = 15d6df6dedf9b2cec05f7a56e84f6218853a7975d7c851c44ba69a9f85fb37cf
+SIZE (362882348743b360825fa95b690c05a21078a184.patch) = 1305
diff --git a/graphics/heimer/files/patch-CMakeLists.txt b/graphics/heimer/files/patch-CMakeLists.txt
deleted file mode 100644
index a469a5102378..000000000000
--- a/graphics/heimer/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
---- CMakeLists.txt.orig	2022-09-21 22:58:24 UTC
-+++ CMakeLists.txt
-@@ -96,8 +96,15 @@ set(QT_MIN_VER 5.9.5) # The version in Ubuntu 18.04 LT
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
- set(QT_MIN_VER 5.9.5) # The version in Ubuntu 18.04 LTS
- # This is what Qt Creator 4.13.2 would generate
--find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
--find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Xml Widgets LinguistTools Svg Test Network REQUIRED)
-+
-+OPTION(WITH_QT6 "Enable Qt 6" OFF)
-+if (WITH_QT6)
-+    find_package(QT NAMES Qt6 COMPONENTS Core REQUIRED)
-+    find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Xml Widgets LinguistTools Svg Test Network REQUIRED)
-+else()
-+    find_package(QT NAMES Qt5 COMPONENTS Core REQUIRED)
-+    find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Xml Widgets LinguistTools Svg Test Network REQUIRED)
-+endif()
- 
- # Install paths depend on the build type and target platform
- setup_install_targets()