diff --git a/deskutils/mindforger/Makefile b/deskutils/mindforger/Makefile
index cf5df8b3c2aa..f57e835cf78d 100644
--- a/deskutils/mindforger/Makefile
+++ b/deskutils/mindforger/Makefile
@@ -1,54 +1,55 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 
 PORTNAME=	mindforger
-PORTVERSION=	1.53.0
+PORTVERSION=	1.54.0
 CATEGORIES=	deskutils
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Thinking notebook and markdown editor
 
 LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libhunspell-1.7.so:textproc/hunspell
 
 USES=		pkgconfig qmake qt:5
 USE_QT=		buildtools_build core declarative gui location network \
 		printsupport webchannel widgets
 USE_GITHUB=	yes
 GH_ACCOUNT=	dvorka
 GH_PROJECT=	cmark:cm
 GH_TAGNAME=	4ca8688:cm
 GH_SUBDIR=	deps/cmark-gfm:cm
 
 QMAKE_ARGS=	CONFIG+="mfnocxx"
 
 OPTIONS_DEFINE=	CMARK
 OPTIONS_DEFAULT=	CMARK
 CMARK_DESC=	CommonMark support (Markdown -> HTML rendering)
 
 CMARK_BUILD_DEPENDS=	cmake:devel/cmake
 CMARK_QMAKE_OFF=	CONFIG+="mfnomd2html"
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386
 USE_QT+=	webengine
 QMAKE_ARGS+=	CONFIG+="mfwebengine"
 .else
 USE_QT+=	webkit
 .endif
 
 pre-build-CMARK-on:
 	@cd ${WRKSRC_cm} && cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
 		-DCMARK_TESTS:BOOL=OFF -DCMARK_SHARED:BOOL=OFF \
 		-B build && cmake --build build
 
 post-patch:
 	@${REINPLACE_CMD} -e '/_WIN32/s,_APPLE,_${OPSYS},' \
 		${WRKSRC}/app/src/qt/note_view_presenter.cpp \
 		${WRKSRC}/app/src/qt/note_view_presenter.h \
 		${WRKSRC}/app/src/qt/outline_header_view_presenter.cpp
+	@${REINPLACE_CMD} -e 's/53/54/' ${WRKSRC}/lib/src/app_info.h
 	@${REINPLACE_CMD} -e 's/_current_dir_name(/cwd(nullptr, 0/' \
 		${WRKSRC}/lib/src/gear/file_utils.cpp
 
 .include <bsd.port.mk>
diff --git a/deskutils/mindforger/distinfo b/deskutils/mindforger/distinfo
index 277f63fcc09e..3210b7a11c92 100644
--- a/deskutils/mindforger/distinfo
+++ b/deskutils/mindforger/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1640528172
-SHA256 (dvorka-mindforger-1.53.0_GH0.tar.gz) = a8a917c4b6eb28b16ab09322108049408c9bcb897baeba786042c1bcb1389ce7
-SIZE (dvorka-mindforger-1.53.0_GH0.tar.gz) = 2137346
+TIMESTAMP = 1641748185
+SHA256 (dvorka-mindforger-1.54.0_GH0.tar.gz) = 1f274b810cf1a4ee31e7d3aa9adc21660f11d2cfff23e1e6950141d96068de5a
+SIZE (dvorka-mindforger-1.54.0_GH0.tar.gz) = 2128313
 SHA256 (dvorka-cmark-4ca8688_GH0.tar.gz) = 8486c44ed23ae3865f5ebba034e319ed9e65340ffca1df09a4edd4b4677ab6cb
 SIZE (dvorka-cmark-4ca8688_GH0.tar.gz) = 288979
diff --git a/deskutils/mindforger/files/patch-app_app.pro b/deskutils/mindforger/files/patch-app_app.pro
index 07e4ced9de25..dba5719015cd 100644
--- a/deskutils/mindforger/files/patch-app_app.pro
+++ b/deskutils/mindforger/files/patch-app_app.pro
@@ -1,17 +1,18 @@
---- app/app.pro.orig	2021-12-26 14:16:12 UTC
+--- app/app.pro.orig	2022-01-09 17:09:45 UTC
 +++ app/app.pro
-@@ -137,12 +137,8 @@ macx {
+@@ -160,13 +160,8 @@ macx {
        ./src/qt/spelling/dictionary_provider_voikko.cpp
  
  } else:unix {
--    # pkgconfig-based configuration does not work @ Ubuntu distribution build
+-    # pkgconfig-based configuration does not work @ Ubuntu
 -    #  CONFIG += link_pkgconfig
 -    #  PKGCONFIG += hunspell
--    # hardcoded paths are unfortunately more robust:
+-
+-    # hardcoded paths are (unfortunately) more robust:
 -    INCLUDEPATH += /usr/include/hunspell
 -    LIBS += -lhunspell
 +    CONFIG += link_pkgconfig
 +    PKGCONFIG += hunspell
  
      HEADERS += \
        ./src/qt/spelling/dictionary_provider_hunspell.h \
diff --git a/deskutils/mindforger/files/patch-lib_src_gear_string__utils.h b/deskutils/mindforger/files/patch-lib_src_gear_string__utils.h
index 65a3b2159cc7..a439ac5ea776 100644
--- a/deskutils/mindforger/files/patch-lib_src_gear_string__utils.h
+++ b/deskutils/mindforger/files/patch-lib_src_gear_string__utils.h
@@ -1,17 +1,18 @@
---- lib/src/gear/string_utils.h.orig	2020-03-08 17:03:52 UTC
+--- lib/src/gear/string_utils.h.orig	2022-01-09 17:09:45 UTC
 +++ lib/src/gear/string_utils.h
-@@ -114,12 +114,12 @@ static inline char *stringTrim(const char *s) {
- }
- 
- static inline std::string &stringLeftTrim(std::string& s) {
--    s.erase(s.begin(), std::find_if(s.begin(), s.end(), std::not1(std::ptr_fun<int, int>(isspace))));
-+    s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](int c) { return !std::isspace(c); }));
+@@ -118,13 +118,13 @@ static inline std::string &stringLeftTrim(std::string&
+         s.begin(),
+         std::find_if(s.begin(),
+         s.end(),
+-        std::not1(std::ptr_fun<int, int>(isspace)))
++        [](int c) { return !std::isspace(c); })
+     );
      return s;
  }
  
  static inline std::string &stringRightTrim(std::string& s) {
 -    s.erase(std::find_if(s.rbegin(), s.rend(), std::not1(std::ptr_fun<int, int>(isspace))).base(), s.end());
 +    s.erase(std::find_if(s.rbegin(), s.rend(), [](int c) { return !std::isspace(c); }).base(), s.end());
      return s;
  }