diff --git a/sysutils/dwatch-gource/Makefile b/sysutils/dwatch-gource/Makefile
index 7cf8716dc852..44a5c50ada9b 100644
--- a/sysutils/dwatch-gource/Makefile
+++ b/sysutils/dwatch-gource/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	dwatch-gource
 DISTVERSION=	0.9
 CATEGORIES=	sysutils
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	FreeBSD dwatch profiles for creating gource logs
-WWW=		https://fraubsd.org/dwatch-gource/
+WWW=		https://github.com/FrauBSD/dwatch-gource
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FrauBSD
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/gwatch ${STAGEDIR}${PREFIX}/sbin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/dwatch
 	${INSTALL_DATA} ${WRKSRC}/gource-* ${STAGEDIR}${PREFIX}/libexec/dwatch
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/dwatch-json/Makefile b/sysutils/dwatch-json/Makefile
index 4d1e816e61c4..47c9f1947c95 100644
--- a/sysutils/dwatch-json/Makefile
+++ b/sysutils/dwatch-json/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	dwatch-json
 DISTVERSION=	1.2
 CATEGORIES=	sysutils
 
 MAINTAINER=	dteske@FreeBSD.org
 COMMENT=	FreeBSD dwatch suite to produce JSON stats
-WWW=		https://fraubsd.org/dwatch-json/
+WWW=		https://github.com/FrauBSD/dwatch-json
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FrauBSD
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/dwatch
 	${INSTALL_DATA} ${WRKSRC}/json-* ${STAGEDIR}${PREFIX}/libexec/dwatch
 	${INSTALL_DATA} ${WRKSRC}/dwatch-json-io.conf ${STAGEDIR}${PREFIX}/etc/dwatch-json-io.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/dwatch-json-net.conf ${STAGEDIR}${PREFIX}/etc/dwatch-json-net.conf.sample
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/cron.d
 	${INSTALL_DATA} ${WRKSRC}/grafio/cron.d/* ${STAGEDIR}${PREFIX}/etc/cron.d
 	${INSTALL_DATA} ${WRKSRC}/grafnet/cron.d/* ${STAGEDIR}${PREFIX}/etc/cron.d
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/grafio
 	${INSTALL_DATA} ${WRKSRC}/grafio/etc/* ${STAGEDIR}${PREFIX}/etc/grafio
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/grafnet
 	${INSTALL_DATA} ${WRKSRC}/grafnet/etc/* ${STAGEDIR}${PREFIX}/etc/grafnet
 	@${MKDIR} ${STAGEDIR}${PREFIX}/sbin
 	@${LN} -s grafio ${STAGEDIR}${PREFIX}/sbin/gio
 	@${LN} -s grafnet ${STAGEDIR}${PREFIX}/sbin/gn
 	${INSTALL_SCRIPT} ${WRKSRC}/graf/logs ${STAGEDIR}${PREFIX}/sbin/grafio-logs
 	${INSTALL_SCRIPT} ${WRKSRC}/graf/logs ${STAGEDIR}${PREFIX}/sbin/grafnet-logs
 	${INSTALL_SCRIPT} ${WRKSRC}/graf/rotate ${STAGEDIR}${PREFIX}/sbin/grafio-rotate
 	${INSTALL_SCRIPT} ${WRKSRC}/graf/rotate ${STAGEDIR}${PREFIX}/sbin/grafnet-rotate
 	${INSTALL_SCRIPT} ${WRKSRC}/graf/stats ${STAGEDIR}${PREFIX}/sbin/grafio_stats
 	${INSTALL_SCRIPT} ${WRKSRC}/graf/stats ${STAGEDIR}${PREFIX}/sbin/grafnet_stats
 	${INSTALL_SCRIPT} ${WRKSRC}/grafio/grafio ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/grafio/rc.d/* ${STAGEDIR}${PREFIX}/etc/rc.d
 	${INSTALL_SCRIPT} ${WRKSRC}/grafnet/grafnet ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/grafnet/rc.d/* ${STAGEDIR}${PREFIX}/etc/rc.d
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/examples/grafio/dashboards
 	${INSTALL_DATA} ${WRKSRC}/grafio/dashboards/* ${STAGEDIR}${PREFIX}/share/examples/grafio/dashboards
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/examples/grafnet/dashboards
 	${INSTALL_DATA} ${WRKSRC}/grafnet/dashboards/* ${STAGEDIR}${PREFIX}/share/examples/grafnet/dashboards
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/dwatch-pwsnoop/Makefile b/sysutils/dwatch-pwsnoop/Makefile
index 0993cd10db06..b8b112139f4b 100644
--- a/sysutils/dwatch-pwsnoop/Makefile
+++ b/sysutils/dwatch-pwsnoop/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	dwatch-pwsnoop
 DISTVERSION=	0.1.1
 CATEGORIES=	sysutils
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	FreeBSD dwatch profile for snooping passwords
-WWW=		https://fraubsd.org/dwatch-pwsnoop/
+WWW=		https://github.com/FrauBSD/dwatch-pwsnoop
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FrauBSD
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 PLIST_FILES=	libexec/dwatch/pwsnoop
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/dwatch
 	${INSTALL_DATA} ${WRKSRC}/pwsnoop ${STAGEDIR}${PREFIX}/libexec/dwatch
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/mping/Makefile b/sysutils/mping/Makefile
index 8c4bf8d74f8c..88cca25745a2 100644
--- a/sysutils/mping/Makefile
+++ b/sysutils/mping/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	mping
 DISTVERSION=	0.1.4
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-fraubsd
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ping multiple hosts
-WWW=		https://fraubsd.org/mping/
+WWW=		https://github.com/FrauBSD/mping
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FrauBSD
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/mping
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/mping ${STAGEDIR}${PREFIX}/bin
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/ssd_report/Makefile b/sysutils/ssd_report/Makefile
index e834ebc6b7bd..a6c476244488 100644
--- a/sysutils/ssd_report/Makefile
+++ b/sysutils/ssd_report/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	ssd_report
 DISTVERSION=	0.4
 CATEGORIES=	sysutils
 
 MAINTAINER=	dteske@FreeBSD.org
 COMMENT=	SSD health report
-WWW=		https://fraubsd.org/ssd_report/
+WWW=		https://github.com/FrauBSD/ssd_report
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 FLAVORS=	smart smartmontools
 
 smart_RUN_DEPENDS=		smart:sysutils/smart
 smartmontools_RUN_DEPENDS=	smartctl:sysutils/smartmontools
 smartmontools_PKGNAMESUFFIX=	-smartmontools
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FrauBSD
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 PLIST_FILES=	sbin/ssd_report
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/ssd_report ${STAGEDIR}${PREFIX}/sbin
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>