diff --git a/devel/cxxtest/Makefile b/devel/cxxtest/Makefile
index d4b4e64e1b10..648fb2d87279 100644
--- a/devel/cxxtest/Makefile
+++ b/devel/cxxtest/Makefile
@@ -1,24 +1,47 @@
 PORTNAME=	cxxtest
 PORTVERSION=	4.4
+PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	SF
+MASTER_SITES=	SF:DEFAULT \
+		https://github.com/CxxTest/cxxtest.github.com/raw/8505a9c37bdf17d9167f0b946c82ccb032d3cd4c/:docs
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	hselasky@FreeBSD.org
+MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Simple and powerful JUnit/CppUnit/xUnit-like framework for C++
-WWW=		http://cxxtest.sourceforge.net/
+#WWW=		http://cxxtest.com/ # unavailable, https://github.com/CxxTest/cxxtest/issues/157
+#WWW=		https://github.com/CxxTest/cxxtest.github.com
+WWW=		https://github.com/CxxTest/cxxtest
 
 LICENSE=	LGPL3+
 
 USES=		gmake python:run
 
 USE_PYTHON=	autoplist distutils noflavors
 NO_ARCH=	yes
 
 WRKSRC_SUBDIR=		python
 
+OPTIONS_DEFINE=		DOCS EXAMPLES
+OPTIONS_DEFAULT=	DOCS EXAMPLES
+
+DOCS_DISTFILES=		guide.pdf:docs
+DOCS_PORTDOCS=		*
+EXAMPLES_PORTEXAMPLES=	*
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/cxxtest
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/cxxtest/* \
 		${STAGEDIR}${PREFIX}/include/cxxtest/
 
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/guide.pdf ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/guide.txt ${STAGEDIR}${DOCSDIR}
+
+post-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	( cd ${WRKSRC}/../sample/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} )
+
 .include <bsd.port.mk>
diff --git a/devel/cxxtest/distinfo b/devel/cxxtest/distinfo
index 052107e7ef56..51b162de3079 100644
--- a/devel/cxxtest/distinfo
+++ b/devel/cxxtest/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1567682856
-SHA256 (cxxtest-4.4.tar.gz) = 1c154fef91c65dbf1cd4519af7ade70a61d85a923b6e0c0b007dc7f4895cf7d8
-SIZE (cxxtest-4.4.tar.gz) = 330076
+TIMESTAMP = 1690034322
+SHA256 (cxxtest/cxxtest-4.4.tar.gz) = 1c154fef91c65dbf1cd4519af7ade70a61d85a923b6e0c0b007dc7f4895cf7d8
+SIZE (cxxtest/cxxtest-4.4.tar.gz) = 330076
+SHA256 (cxxtest/guide.pdf) = 05d4afa4ca48113a2d2d6c6efc9cf88297986204a74aad4caa70a8211bdd1cf8
+SIZE (cxxtest/guide.pdf) = 270989