diff --git a/security/rhash/Makefile b/security/rhash/Makefile
index b46de32c77a0..1186d9c83e7c 100644
--- a/security/rhash/Makefile
+++ b/security/rhash/Makefile
@@ -1,56 +1,52 @@
 PORTNAME=	rhash
 PORTVERSION=	1.4.4
 PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 PATCH_SITES=	https://github.com/rhash/RHash/commit/
 PATCHFILES+=	c804982d1b24c6533118b3068d2cfdca685076f3.patch:-p1
 PATCHFILES+=	9ef90b958b7ae50aeeb5c269468034d73d6e2efe.patch:-p1
 PATCHFILES+=	b8c91ea6551e99e10352386cd46ea26973bb4a4d.patch:-p1
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Utility and library for computing and checking of file hashes
-WWW=		https://rhash.sourceforge.net/
+WWW=		https://rhash.sourceforge.io/
 
 LICENSE=	BSD0CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+USES=		cpe
+CPE_VENDOR=	${PORTNAME}_project
+USE_LDCONFIG=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix="${PREFIX}" \
 		--pkgconfigdir="${PREFIX}/libdata/pkgconfig" \
 		--enable-lib-static --enable-openssl-runtime \
 		--extra-cflags="${CFLAGS}" --extra-ldflags="${LDFLAGS}"
+MAKE_ARGS=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+		INSTALL_SHARED="${INSTALL_LIB}"
 INSTALL_TARGET=	install install-lib-so-link install-pkg-config
-
-USES=		cpe
-CPE_VENDOR=	${PORTNAME}_project
-USE_LDCONFIG=	yes
+TEST_TARGET=	test-full
 
 WRKSRC=		${WRKDIR}/RHash-${PORTVERSION}
 
 PORTDOCS=	ChangeLog README.md
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext localbase:ldflags
 NLS_CONFIGURE_ON=	--enable-gettext
 NLS_INSTALL_TARGET=	install-gmo
 
 post-patch:
 	@${REINPLACE_CMD} -e '/BYTE_ORDER/s,__,_,g' \
 		${WRKSRC}/librhash/byte_order.h
 
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rhash ${STAGEDIR}${PREFIX}/lib/librhash.so
-
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
-do-test:
-	cd ${WRKSRC}/tests && ${SH} test_rhash.sh --full --shared ../rhash
-
 .include <bsd.port.mk>