diff --git a/editors/notepadnext/Makefile b/editors/notepadnext/Makefile
index 5d49a1dd5c90..2c1907c1aa37 100644
--- a/editors/notepadnext/Makefile
+++ b/editors/notepadnext/Makefile
@@ -1,39 +1,42 @@
 PORTNAME=	notepadnext
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	editors
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	ece83c8d9dc72e987798b5b158770a4b6a502aff.patch:-p1 # https://github.com/dail8859/NotepadNext/pull/124 - fix installed file locations
+
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Reimplementation of Notepad++
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libuchardet.so:textproc/uchardet
 
-USES=		gl qmake qt:5 xorg
+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:d5fefaa35fb53e299b7f39b0d8f541954c710d94: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
-
-do-install: # workaround for https://github.com/dail8859/NotepadNext/issues/123
-	${INSTALL_PROGRAM} ${WRKSRC}/NotepadNext/NotepadNext ${STAGEDIR}${PREFIX}/bin/NotepadNext
+PLIST_FILES=	bin/NotepadNext \
+		share/applications/NotepadNext.desktop \
+		share/icons/hicolor/scalable/mimetypes/NotepadNext.svg
 
 .include <bsd.port.mk>
diff --git a/editors/notepadnext/distinfo b/editors/notepadnext/distinfo
index 7aa11e0532f9..647a2c5b06de 100644
--- a/editors/notepadnext/distinfo
+++ b/editors/notepadnext/distinfo
@@ -1,13 +1,15 @@
-TIMESTAMP = 1651366379
+TIMESTAMP = 1651458691
 SHA256 (dail8859-NotepadNext-v0.5.1_GH0.tar.gz) = 6033f82d41be516f04fabd31213ead35ca2a4ead5adb74501766c9464a3d9548
 SIZE (dail8859-NotepadNext-v0.5.1_GH0.tar.gz) = 4544658
 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-d5fefaa35fb53e299b7f39b0d8f541954c710d94_GH0.tar.gz) = ddad83d4a349f5401e973fccd36e72d2d15fa140902d51a4accb39288c477413
 SIZE (githubuser0xFFFF-Qt-Advanced-Docking-System-d5fefaa35fb53e299b7f39b0d8f541954c710d94_GH0.tar.gz) = 10206316
 SHA256 (itay-grudev-SingleApplication-d0c43a51ad7d4f74ae5cff8d8cbf8aba0cf5e51c_GH0.tar.gz) = e49a35dd366a3a2ddc4b97f1d5fb5af9bed84a04a693645f61248c78ba370676
 SIZE (itay-grudev-SingleApplication-d0c43a51ad7d4f74ae5cff8d8cbf8aba0cf5e51c_GH0.tar.gz) = 21560
+SHA256 (ece83c8d9dc72e987798b5b158770a4b6a502aff.patch) = 0b9653aa9c600642775c4d72d9c56ca5d78252ef7e478a7799f816f42b516cd2
+SIZE (ece83c8d9dc72e987798b5b158770a4b6a502aff.patch) = 1150