diff --git a/misc/gnu-watch/Makefile b/misc/gnu-watch/Makefile
index 57c66acfb194..263bf409580f 100644
--- a/misc/gnu-watch/Makefile
+++ b/misc/gnu-watch/Makefile
@@ -1,43 +1,48 @@
 PORTNAME=	watch
-DISTVERSIONPREFIX=	v
 DISTVERSION=	4.0.6
+PORTREVISION=	1
 CATEGORIES=	misc
+MASTER_SITES=	SF/procps-ng/Production
 PKGNAMEPREFIX=	gnu-
+DISTNAME=	procps-ng-${DISTVERSION}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	GNU watch command
 WWW=		https://gitlab.com/procps-ng/procps/
 
 LICENSE=	GPLv2
 
-USES=		autoreconf gettext-tools gmake libtool localbase:ldflags \
+USES=		gettext-tools gmake libtool localbase:ldflags \
 		ncurses pkgconfig tar:xz
-USE_CSTD=	gnu99
-USE_GITLAB=	yes
-GL_ACCOUNT=	procps-ng
-GL_PROJECT=	procps
+
 GNU_CONFIGURE=	yes
 
 ALL_TARGET=	src/watch
 
 PLIST_FILES=	bin/${PKGBASE} \
 		share/man/man1/gnu-watch.1.gz
 
 OPTIONS_DEFINE=		NLS UNICODE
 OPTIONS_DEFAULT=	UNICODE
 
 NLS_USES=			gettext
 NLS_CONFIGURE_OFF=		--disable-nls
-NLS_LDFLAGS=			-lintl
+
 UNICODE_CONFIGURE_ENABLE=	watch8bit
 
 post-patch:
-	${REINPLACE_CMD} 's/ncursesw/${NCURSES_IMPL}/g' ${WRKSRC}/configure.ac
+	@${REINPLACE_CMD} -e '\
+		s|WATCH|${PKGBASE:tu}|g; \
+		s|watch \\-|${PKGBASE} \\-|g; \
+		s|B watch|B ${PKGBASE}|g; \
+		s|fBwatch|fB${PKGBASE}|g; \
+		s|watch uname|${PKGBASE} uname|g' \
+		${PATCH_WRKSRC}/man/watch.1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/watch \
 		${STAGEDIR}${PREFIX}/bin/gnu-watch
 	${INSTALL_MAN} ${WRKSRC}/man/watch.1 \
 		${STAGEDIR}${PREFIX}/share/man/man1/gnu-watch.1
 
 .include <bsd.port.mk>
diff --git a/misc/gnu-watch/distinfo b/misc/gnu-watch/distinfo
index 023c9111b1cd..80f301544ccc 100644
--- a/misc/gnu-watch/distinfo
+++ b/misc/gnu-watch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1781953336
-SHA256 (procps-v4.0.6.tar.bz2) = 144410bd111330b191d4384ba6e8b4861390c644b7188e9487f779116b35a33c
-SIZE (procps-v4.0.6.tar.bz2) = 1576563
+TIMESTAMP = 1781964504
+SHA256 (procps-ng-4.0.6.tar.xz) = 67bea6fbc3a42a535a0230c9e891e5ddfb4d9d39422d46565a2990d1ace15216
+SIZE (procps-ng-4.0.6.tar.xz) = 1580516