diff --git a/editors/notepadnext/Makefile b/editors/notepadnext/Makefile
index 0e55c8fbc921..054d500c6af5 100644
--- a/editors/notepadnext/Makefile
+++ b/editors/notepadnext/Makefile
@@ -1,40 +1,39 @@
 PORTNAME=	notepadnext
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6
+DISTVERSION=	0.6.1
 CATEGORIES=	editors
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Reimplementation of Notepad++
 WWW=		https://github.com/dail8859/NotepadNext
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libuchardet.so:textproc/uchardet
 
 USES=		desktop-file-utils gl qmake qt:5 xorg
 USE_QT=		core gui network printsupport widgets buildtools:build linguisttools:build
 USE_GL=		gl
 USE_XORG=	xcb
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dail8859
 GH_PROJECT=	NotepadNext
 
 GH_TUPLE=	alex-spataru:QSimpleUpdater:62e0ce7dde4c76e7533f2f0ee53f19ee1690c8dd:alex_spataru_QSimpleUpdater/src/QSimpleUpdater \
 		editorconfig:editorconfig-core-qt:52820d59769fcba6d0ed94f685406c0383fe1a30:editorconfig_editorconfig_core_qt/src/editorconfig-core-qt \
-		editorconfig:editorconfig-core-test:70840cfaf6a06766ab61e975b8a1fe3b891ee08e:editorconfig_editorconfig_core_test/src/editorconfig-core-qt/tests \
 		githubuser0xFFFF:Qt-Advanced-Docking-System:89ff0ad311ec0cba7e7685c070d3be3a055cce71:githubuser0xFFFF_Qt_Advanced_Docking_System/src/ads \
 		itay-grudev:SingleApplication:d0c43a51ad7d4f74ae5cff8d8cbf8aba0cf5e51c:itay_grudev_SingleApplication/src/singleapplication
 
 QMAKE_SOURCE_PATH=	${WRKSRC}/src/NotepadNext.pro
 
 CXXFLAGS+=	-I${LOCALBASE}/include/uchardet
 LDFLAGS+=	-luchardet
 
 PLIST_FILES=	bin/NotepadNext \
 		share/applications/NotepadNext.desktop \
 		share/icons/hicolor/scalable/apps/NotepadNext.svg \
 		share/icons/hicolor/scalable/mimetypes/NotepadNext.svg
 
 .include <bsd.port.mk>
diff --git a/editors/notepadnext/distinfo b/editors/notepadnext/distinfo
index 0e0723e4ec8d..cbe759840cf8 100644
--- a/editors/notepadnext/distinfo
+++ b/editors/notepadnext/distinfo
@@ -1,13 +1,11 @@
-TIMESTAMP = 1674630896
-SHA256 (dail8859-NotepadNext-v0.6_GH0.tar.gz) = 948b980e6a557bc3dbede29a58fdbafcdfda61a73c4908f1a14ed04724d1af7f
-SIZE (dail8859-NotepadNext-v0.6_GH0.tar.gz) = 4703411
+TIMESTAMP = 1680911321
+SHA256 (dail8859-NotepadNext-v0.6.1_GH0.tar.gz) = 0756edf6a8503b0faebcb73868d9375ccd466729d6cc26979d343373498939ce
+SIZE (dail8859-NotepadNext-v0.6.1_GH0.tar.gz) = 4722628
 SHA256 (alex-spataru-QSimpleUpdater-62e0ce7dde4c76e7533f2f0ee53f19ee1690c8dd_GH0.tar.gz) = 1cc98b82e117f10d8eb563357a53c541e2b5e70a7b6845c4ae855b2a27edf448
 SIZE (alex-spataru-QSimpleUpdater-62e0ce7dde4c76e7533f2f0ee53f19ee1690c8dd_GH0.tar.gz) = 298412
 SHA256 (editorconfig-editorconfig-core-qt-52820d59769fcba6d0ed94f685406c0383fe1a30_GH0.tar.gz) = c28d5fded91231985f2b08729dd3f9ad5adbe6d117fbd9b00ab4c5314a761f6a
 SIZE (editorconfig-editorconfig-core-qt-52820d59769fcba6d0ed94f685406c0383fe1a30_GH0.tar.gz) = 6348
-SHA256 (editorconfig-editorconfig-core-test-70840cfaf6a06766ab61e975b8a1fe3b891ee08e_GH0.tar.gz) = 1692c09541fa0c4b0b166335c4cc0cb6a7b38bc65a6f5c0d4973c57768341c53
-SIZE (editorconfig-editorconfig-core-test-70840cfaf6a06766ab61e975b8a1fe3b891ee08e_GH0.tar.gz) = 13587
 SHA256 (githubuser0xFFFF-Qt-Advanced-Docking-System-89ff0ad311ec0cba7e7685c070d3be3a055cce71_GH0.tar.gz) = 84d24e6f97ba1290b66171ca732f0236cec3fe1e70189835ff228e7154c3baec
 SIZE (githubuser0xFFFF-Qt-Advanced-Docking-System-89ff0ad311ec0cba7e7685c070d3be3a055cce71_GH0.tar.gz) = 12045677
 SHA256 (itay-grudev-SingleApplication-d0c43a51ad7d4f74ae5cff8d8cbf8aba0cf5e51c_GH0.tar.gz) = e49a35dd366a3a2ddc4b97f1d5fb5af9bed84a04a693645f61248c78ba370676
 SIZE (itay-grudev-SingleApplication-d0c43a51ad7d4f74ae5cff8d8cbf8aba0cf5e51c_GH0.tar.gz) = 21560
diff --git a/editors/notepadnext/files/patch-src_ads_src_linux_FloatingWidgetTitleBar.cpp b/editors/notepadnext/files/patch-src_ads_src_linux_FloatingWidgetTitleBar.cpp
index b62b3f7bfa86..e4f4d46cf8df 100644
--- a/editors/notepadnext/files/patch-src_ads_src_linux_FloatingWidgetTitleBar.cpp
+++ b/editors/notepadnext/files/patch-src_ads_src_linux_FloatingWidgetTitleBar.cpp
@@ -1,11 +1,11 @@
---- src/ads/src/linux/FloatingWidgetTitleBar.cpp.orig	2022-05-01 01:03:58 UTC
+--- src/ads/src/linux/FloatingWidgetTitleBar.cpp.orig	2023-04-08 00:42:57 UTC
 +++ src/ads/src/linux/FloatingWidgetTitleBar.cpp
 @@ -194,7 +194,7 @@ void CFloatingWidgetTitleBar::mouseMoveEvent(QMouseEve
  	{
  		if(d->FloatingWidget->isMaximized())
  		{
 -			d->FloatingWidget->showNormal(true);
 +			d->FloatingWidget->showNormal();
  		}
  		d->FloatingWidget->moveFloating();
  		Super::mouseMoveEvent(ev);
diff --git a/editors/notepadnext/files/patch-src_i18n.pri b/editors/notepadnext/files/patch-src_i18n.pri
index 302b41411770..01369a4f7a2a 100644
--- a/editors/notepadnext/files/patch-src_i18n.pri
+++ b/editors/notepadnext/files/patch-src_i18n.pri
@@ -1,25 +1,25 @@
 - translations are broken, see https://github.com/dail8859/NotepadNext/issues/147
 
---- src/i18n.pri.orig	2022-07-07 05:49:45 UTC
+--- src/i18n.pri.orig	2023-04-08 00:35:34 UTC
 +++ src/i18n.pri
-@@ -18,13 +18,13 @@
+@@ -18,12 +18,12 @@
  
- CONFIG += lrelease
+ CONFIG += lrelease embed_translations
  
 -TRANSLATIONS = \
--    ../../i18n/NotepadNext.zh_CN.ts \
--    ../../i18n/NotepadNext.sv_SE.ts
+-    ../../i18n/NotepadNext_zh_CN.ts \
+-    ../../i18n/NotepadNext_sv_SE.ts \
+-    ../../i18n/NotepadNext_uk_UA.ts
 +#TRANSLATIONS = \
-+#    ../../i18n/NotepadNext.zh_CN.ts \
-+#    ../../i18n/NotepadNext.sv_SE.ts
++#    ../../i18n/NotepadNext_zh_CN.ts \
++#    ../../i18n/NotepadNext_sv_SE.ts \
++#    ../../i18n/NotepadNext_uk_UA.ts
  
 -EXTRA_TRANSLATIONS = \
 -    $$[QT_INSTALL_TRANSLATIONS]/qt_zh_CN.qm \
--    $$[QT_INSTALL_TRANSLATIONS]/qt_sv.qm
+-    $$[QT_INSTALL_TRANSLATIONS]/qt_sv.qm \
+-    $$[QT_INSTALL_TRANSLATIONS]/qt_uk.qm
 +#EXTRA_TRANSLATIONS = \
 +#    $$[QT_INSTALL_TRANSLATIONS]/qt_zh_CN.qm \
-+#    $$[QT_INSTALL_TRANSLATIONS]/qt_sv.qm
- 
- # Output folder for `.qm` files
--LRELEASE_DIR = $$OUT_PWD/i18n
-+#LRELEASE_DIR = $$OUT_PWD/i18n
++#    $$[QT_INSTALL_TRANSLATIONS]/qt_sv.qm \
++#    $$[QT_INSTALL_TRANSLATIONS]/qt_uk.qm