diff --git a/graphics/heimer/Makefile b/graphics/heimer/Makefile
index d6fa796182ee..a09b1f5fdc6c 100644
--- a/graphics/heimer/Makefile
+++ b/graphics/heimer/Makefile
@@ -1,46 +1,45 @@
 PORTNAME=	heimer
-DISTVERSION=	3.6.0
-PORTREVISION=	1
+DISTVERSION=	3.6.1
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/juzzlin/Heimer/releases/download/${DISTVERSION}/
 
 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 9555b54c0f1d..ed31e75ae87a 100644
--- a/graphics/heimer/distinfo
+++ b/graphics/heimer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1661638484
-SHA256 (heimer-3.6.0.tar.gz) = 8a580a74a649fcf25fd137d2c5d5e8b4fa9634a7e943168f94aeacee210df184
-SIZE (heimer-3.6.0.tar.gz) = 1440530
+TIMESTAMP = 1663788092
+SHA256 (heimer-3.6.1.tar.gz) = 55b44a518cd34059e2df50ba4e881029c7963872d5c7a1cff6efa68bd92b2108
+SIZE (heimer-3.6.1.tar.gz) = 1441252
diff --git a/graphics/heimer/files/patch-CMakeLists.txt b/graphics/heimer/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..a469a5102378
--- /dev/null
+++ b/graphics/heimer/files/patch-CMakeLists.txt
@@ -0,0 +1,20 @@
+--- 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()