diff --git a/devel/stlink/Makefile b/devel/stlink/Makefile
index 7979c17123ef..0006a6ed7d52 100644
--- a/devel/stlink/Makefile
+++ b/devel/stlink/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	stlink
 DISTVERSION=	1.7.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	STM32 ST-Link JTAG variant tools
 WWW=		https://github.com/texane/stlink
 
 LICENSE=	BSD3CLAUSE
 
 USES=		cmake pkgconfig
 USE_CSTD=	c99
 USE_GITHUB=	yes
 GH_ACCOUNT=	stlink-org
 USE_LDCONFIG=	yes
 
 PORTDOCS=	${ALLDOCS} README.md
 
 ALLDOCS=	compiling.md dev/developer.txt devices_boards.md \
 		flashloaders.md release.md tutorial.md version_support.md
 
 FLASHLOADERS=	cleanroom.md linker.ld Makefile stm32f0.s stm32f4.s stm32f4lv.s \
 		stm32f7.s stm32f7lv.s stm32l4.s stm32lx.s
 
 OPTIONS_DEFINE=		DOCS GTK3
 OPTIONS_SUB=		yes
 GTK3_USES=		gnome
 GTK3_USE=		GNOME=gtk30
 GTK3_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-pacth-turn-off-gtk
 
 .include <bsd.port.pre.mk>
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/dev
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/README.md
 .for DOC in ${ALLDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${DOC} ${STAGEDIR}${DOCSDIR}/${DOC}
 .endfor
 	${MKDIR} ${STAGEDIR}${DATADIR}
 .for F in ${FLASHLOADERS}
 	${INSTALL_DATA} ${WRKSRC}/flashloaders/${F} ${STAGEDIR}${DATADIR}/${F}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/devel/stlink/files/patch-doc_man_CMakeLists.txt b/devel/stlink/files/patch-doc_man_CMakeLists.txt
deleted file mode 100644
index 5d758bec75dd..000000000000
--- a/devel/stlink/files/patch-doc_man_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/man/CMakeLists.txt.orig	2021-04-24 22:24:02 UTC
-+++ doc/man/CMakeLists.txt
-@@ -30,7 +30,7 @@ foreach (manpage ${MANPAGES})
-     endif ()
- 
-     if (f AND NOT WIN32)
--        install(FILES ${f} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/man/man1)
-+        install(FILES ${f} DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1)
-         unset(f)
-     endif ()
- endforeach ()
diff --git a/devel/stlink/pkg-plist b/devel/stlink/pkg-plist
index 5517705fd5b6..7538410d56f1 100644
--- a/devel/stlink/pkg-plist
+++ b/devel/stlink/pkg-plist
@@ -1,38 +1,38 @@
 bin/st-flash
 bin/st-info
 bin/st-trace
 bin/st-util
 include/stlink/backend.h
 include/stlink/chipid.h
 include/stlink/commands.h
 include/stlink/flash_loader.h
 include/stlink/helper.h
 include/stlink/libusb_settings.h
 include/stlink/logging.h
 include/stlink/md5.h
 include/stlink/reg.h
 include/stlink/sg.h
 include/stlink/stlink.h
 include/stlink/stm32.h
 include/stlink/usb.h
 include/stlink/version.h
 lib/libstlink.so
 lib/libstlink.so.1
 lib/libstlink.so.1.7.0
 lib/libstlink.a
 libdata/pkgconfig/stlink.pc
-man/man1/st-flash.1.gz
-man/man1/st-info.1.gz
-man/man1/st-util.1.gz
+share/man/man1/st-flash.1.gz
+share/man/man1/st-info.1.gz
+share/man/man1/st-util.1.gz
 %%DATADIR%%/Makefile
 %%DATADIR%%/cleanroom.md
 %%DATADIR%%/linker.ld
 %%DATADIR%%/stm32f0.s
 %%DATADIR%%/stm32f4.s
 %%DATADIR%%/stm32f4lv.s
 %%DATADIR%%/stm32f7.s
 %%DATADIR%%/stm32f7lv.s
 %%DATADIR%%/stm32l4.s
 %%DATADIR%%/stm32lx.s
 %%GTK3%%bin/stlink-gui
 %%GTK3%%%%DATADIR%%/stlink-gui.ui