diff --git a/graphics/heimer/Makefile b/graphics/heimer/Makefile
index 22363fd90b46..3fca970b08f9 100644
--- a/graphics/heimer/Makefile
+++ b/graphics/heimer/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	heimer
-DISTVERSION=	1.21.0
+DISTVERSION=	2.2.0
 CATEGORIES=	graphics
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ed.arrakis@gmail.com
 COMMENT=	Simple mind map, diagram, and note-taking tool
 
 LICENSE=	CC-BY-SA-3.0 GPLv3+
@@ -19,13 +19,26 @@ USE_QT=		core gui svg widgets xml buildtools_build linguisttools_build \
 		qmake_build testlib_build
 TEST_TARGET=	test
 
-OPTIONS_DEFINE=	EXAMPLES
+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
 
-post-install-EXAMPLES-on:
-	cd ${WRKSRC}/examples && \
-		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
-
 .include <bsd.port.mk>
diff --git a/graphics/heimer/distinfo b/graphics/heimer/distinfo
index 2ccac41d9143..efd5b936a18d 100644
--- a/graphics/heimer/distinfo
+++ b/graphics/heimer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1603107072
-SHA256 (juzzlin-Heimer-1.21.0_GH0.tar.gz) = 3ec106b3b30cdbe04adcea37981c9214325a0aa92f2fae2df0bc12c95146434f
-SIZE (juzzlin-Heimer-1.21.0_GH0.tar.gz) = 878043
+TIMESTAMP = 1611218553
+SHA256 (juzzlin-Heimer-2.2.0_GH0.tar.gz) = 70cbf38832957c7d452f255f298cbfd1dfa3556a78e8076820306bc1e486e12e
+SIZE (juzzlin-Heimer-2.2.0_GH0.tar.gz) = 884439
diff --git a/graphics/heimer/pkg-descr b/graphics/heimer/pkg-descr
index 41d0f53b4a87..a80346858875 100644
--- a/graphics/heimer/pkg-descr
+++ b/graphics/heimer/pkg-descr
@@ -2,17 +2,19 @@ Heimer is a desktop application for creating mind maps and other
 suitable diagrams.  It is written in Qt.
 
 Features:
+
+- Adjustable grid
+- Automatic layout optimization
 - Easy-to-use UI
+- Export to PNG or SVG
+- Forever 100% free
+- Full undo/redo
+- Nice animations
+- Quickly add node text and edge labels
+- Save/load in XML-based .ALZ-files
+- Translations in English (default), Finnish, French, Italian, Dutch
 - Very fast
 - Zoom in/out/fit
 - Zoom with mouse wheel
-- Save/load in XML-based .ALZ-files
-- Export to PNG images
-- Quickly add node text and edge labels
-- Nice animations
-- Full undo/redo
-- Adjustable grid
-- Translations in English, Finnish, French, Italian
-- Forever 100% free
 
 WWW: https://github.com/juzzlin/Heimer
diff --git a/graphics/heimer/pkg-plist b/graphics/heimer/pkg-plist
index e7aa30131a8b..384e512fc4bc 100644
--- a/graphics/heimer/pkg-plist
+++ b/graphics/heimer/pkg-plist
@@ -1,12 +1,5 @@
 bin/heimer
-@comment include/argengine.hpp
-@comment include/simple_logger.hpp
-@comment lib/libArgengine.a
-@comment lib/libSimpleLogger.a
 share/applications/heimer.desktop
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Company.alz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Family.alz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Heimer.alz
 share/icons/hicolor/64x64/apps/heimer.png
 share/metainfo/heimer.appdata.xml
 share/pixmaps/heimer.png