diff --git a/editors/notepadnext/Makefile b/editors/notepadnext/Makefile
index 44dac73c4d074..4f4d08481ae4f 100644
--- a/editors/notepadnext/Makefile
+++ b/editors/notepadnext/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	notepadnext
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.3
+DISTVERSION=	0.6.4
 CATEGORIES=	editors
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -23,8 +23,9 @@ 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 \
-		githubuser0xFFFF:Qt-Advanced-Docking-System:89ff0ad:githubuser0xFFFF_Qt_Advanced_Docking_System/src/ads \
-		itay-grudev:SingleApplication:d0c43a5:itay_grudev_SingleApplication/src/singleapplication
+			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:14e9d14675156d3b55473a3b085de0e2a9f75578:itay_grudev_SingleApplication/src/singleapplication
 
 QMAKE_SOURCE_PATH=	${WRKSRC}/src/NotepadNext.pro
 
diff --git a/editors/notepadnext/distinfo b/editors/notepadnext/distinfo
index 176b32ecf1003..734c817831c6c 100644
--- a/editors/notepadnext/distinfo
+++ b/editors/notepadnext/distinfo
@@ -1,11 +1,13 @@
-TIMESTAMP = 1685728226
-SHA256 (dail8859-NotepadNext-v0.6.3_GH0.tar.gz) = 4e4d9d72b38e9b217e98aa3d1350faa470da5c092468fca6ceb12c1508d902bb
-SIZE (dail8859-NotepadNext-v0.6.3_GH0.tar.gz) = 4734187
+TIMESTAMP = 1697774688
+SHA256 (dail8859-NotepadNext-v0.6.4_GH0.tar.gz) = c52f09d76b9b4d240cc7b0289356232ea15c7c3c3843f8f13ec4f9dd3415ffe2
+SIZE (dail8859-NotepadNext-v0.6.4_GH0.tar.gz) = 5193887
 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 (githubuser0xFFFF-Qt-Advanced-Docking-System-89ff0ad_GH0.tar.gz) = 25548b0e904befcb947e6dc26da12c420648b04e2d2130873135e3debb1b354e
-SIZE (githubuser0xFFFF-Qt-Advanced-Docking-System-89ff0ad_GH0.tar.gz) = 12044045
-SHA256 (itay-grudev-SingleApplication-d0c43a5_GH0.tar.gz) = 66eed655282d09e75a34f77698aebe56f2bec25daae32b8c11d597c3e81cbb6d
-SIZE (itay-grudev-SingleApplication-d0c43a5_GH0.tar.gz) = 21564
+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-14e9d14675156d3b55473a3b085de0e2a9f75578_GH0.tar.gz) = 826a2eb9ac72aab77f7e1fe9d398c955696212c30f3f64edbfc47d997cdbc334
+SIZE (itay-grudev-SingleApplication-14e9d14675156d3b55473a3b085de0e2a9f75578_GH0.tar.gz) = 22733
diff --git a/editors/notepadnext/files/patch-src_i18n.pri b/editors/notepadnext/files/patch-src_i18n.pri
index 2ed7ce7c7ef09..e49687b102c5e 100644
--- a/editors/notepadnext/files/patch-src_i18n.pri
+++ b/editors/notepadnext/files/patch-src_i18n.pri
@@ -1,29 +1,31 @@
-- translations are broken, see https://github.com/dail8859/NotepadNext/issues/147
-
---- src/i18n.pri.orig	2023-06-02 02:06:59 UTC
+--- src/i18n.pri.orig	2023-10-20 04:05:44 UTC
 +++ src/i18n.pri
-@@ -18,14 +18,14 @@
+@@ -18,16 +18,16 @@
  
  CONFIG += lrelease embed_translations
  
 -TRANSLATIONS = \
 -    ../../i18n/NotepadNext_zh_CN.ts \
+-    ../../i18n/NotepadNext_zh_TW.ts \
 -    ../../i18n/NotepadNext_sv_SE.ts \
 -    ../../i18n/NotepadNext_uk_UA.ts \
 -    ../../i18n/NotepadNext_tr_TR.ts
 +#TRANSLATIONS = \
 +#    ../../i18n/NotepadNext_zh_CN.ts \
++#    ../../i18n/NotepadNext_zh_TW.ts \
 +#    ../../i18n/NotepadNext_sv_SE.ts \
 +#    ../../i18n/NotepadNext_uk_UA.ts \
 +#    ../../i18n/NotepadNext_tr_TR.ts
  
 -EXTRA_TRANSLATIONS = \
 -    $$[QT_INSTALL_TRANSLATIONS]/qt_zh_CN.qm \
+-    $$[QT_INSTALL_TRANSLATIONS]/qt_zh_TW.qm \
 -    $$[QT_INSTALL_TRANSLATIONS]/qt_sv.qm \
 -    $$[QT_INSTALL_TRANSLATIONS]/qt_uk.qm \
 -    $$[QT_INSTALL_TRANSLATIONS]/qt_tr.qm
 +#EXTRA_TRANSLATIONS = \
 +#    $$[QT_INSTALL_TRANSLATIONS]/qt_zh_CN.qm \
++#    $$[QT_INSTALL_TRANSLATIONS]/qt_zh_TW.qm \
 +#    $$[QT_INSTALL_TRANSLATIONS]/qt_sv.qm \
 +#    $$[QT_INSTALL_TRANSLATIONS]/qt_uk.qm \
 +#    $$[QT_INSTALL_TRANSLATIONS]/qt_tr.qm