diff --git a/sysutils/torque/Makefile b/sysutils/torque/Makefile
index 9171332aae16..1f3b44335b20 100644
--- a/sysutils/torque/Makefile
+++ b/sysutils/torque/Makefile
@@ -1,44 +1,53 @@
 PORTNAME=	torque
 PORTVERSION=	2.5.13
 PORTREVISION=	3
+#DISTVERSIONPREFIX=	v
+#DISTVERSION=	6.1.3h5
 PORTEPOCH=	1
 CATEGORIES=	sysutils parallel
 MASTER_SITES=	http://www.adaptivecomputing.com/index.php?wpfb_dl=1643/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open source distributed computing resource manager based on PBS
-WWW=		http://www.adaptivecomputing.com/products/open-source/torque/
+WWW=		https://adaptivecomputing.com/cherry-services/torque-resource-manager/
+
+LICENSE=	BSD4CLAUSE
+LICENSE_FILE=	${WRKSRC}/PBS_License_2.5.txt
+
+DEPRECATED=	unfetchable, upstream no longer open source
+EXPIRATION_DATE=	2024-06-30
 
 BROKEN_aarch64=		fails to link: missing sbrk
 BROKEN_riscv64=		fails to link: missing sbrk
 
-DEPRECATED=	unfetchable, upstream no longer open source
-EXPIRATION_DATE=	2023-12-31
+#USE_GITHUB=	yes
+#GH_ACCOUNT=	adaptivecomputing
+#GH_TAGNAME=	4decc71
 
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 USES=		gmake perl5 libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-syslog \
 		--disable-spool
 MAKE_ENV=	DESTDIR=${STAGEDIR}/${PREFIX}
 USE_RC_SUBR=	pbs_server pbs_sched pbs_mom
 SUB_FILES=	pkg-message torque-config
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 CFLAGS+=	-D_WANT_VMMETER
 
 CONFLICTS_INSTALL=	qstat zh-qterm
 
 OPTIONS_DEFINE=	EXAMPLES
 
 pre-configure:
 	@${REINPLACE_CMD} -E 's|ps[ \t]+-ef|ps -ax|g' ${WRKSRC}/torque.setup
 	@${REINPLACE_CMD} -E 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/torque-config ${STAGEDIR}${PREFIX}/bin
 
 post-install-EXAMPLES-on:
 	${INSTALL_SCRIPT} ${WRKSRC}/torque.setup ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>