diff --git a/x11-wm/herbstluftwm/Makefile b/x11-wm/herbstluftwm/Makefile
index af2feb2c1d70..719fcbf4755c 100644
--- a/x11-wm/herbstluftwm/Makefile
+++ b/x11-wm/herbstluftwm/Makefile
@@ -1,43 +1,42 @@
 PORTNAME=	herbstluftwm
-DISTVERSIONPREFIX=	v
-DISTVERSION=	0.9.4
+DISTVERSION=	0.9.5
 CATEGORIES=	x11-wm
+MASTER_SITES=	https://herbstluftwm.org/tarballs/
 
 MAINTAINER=	uzsolt@uzsolt.hu
 COMMENT=	Manual tiling window manager for X11
 WWW=		https://herbstluftwm.org/
 
 LICENSE=	BSD2CLAUSE
 
 BUILD_DEPENDS=	asciidoc:textproc/asciidoc
 LIB_DEPENDS+=	libfreetype.so:print/freetype2
 
 USES=		cmake compiler:c++11-lang gnome \
 		localbase:ldflags pkgconfig shebangfix xorg
-USE_GITHUB=	yes
 USE_GNOME=	glib20
 USE_XORG=	x11 xext xfixes xft xinerama xrandr xrender
 
 SHEBANG_FILES=	doc/gendoc.py scripts/*.sh share/*.sh
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 OPTIONS_SUB=	yes
 DOCS_USES+=	python:3.5+,build
 DOCS_CMAKE_BOOL+=	WITH_DOCUMENTATION
 
 DOCS_VARS=	binary_alias=python3=${PYTHON_CMD}
 
 .include <bsd.port.options.mk>
 
 post-patch-EXAMPLES-on:
 	@${REINPLACE_CMD} -e 's,$${DOCDIR}/examples,${EXAMPLESDIR},' ${WRKSRC}/CMakeLists.txt
 
 post-patch-EXAMPLES-off:
 	@${REINPLACE_CMD} -e '\@$${DOCDIR}/examples@d' ${WRKSRC}/CMakeLists.txt
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/herbst*
 
 .include <bsd.port.mk>
diff --git a/x11-wm/herbstluftwm/distinfo b/x11-wm/herbstluftwm/distinfo
index cd657370c67d..705be4dfef8f 100644
--- a/x11-wm/herbstluftwm/distinfo
+++ b/x11-wm/herbstluftwm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1647459452
-SHA256 (herbstluftwm-herbstluftwm-v0.9.4_GH0.tar.gz) = b36e143c2ffbd820c7c00e6a1f0a74bc83fed5eb1bab35411503e68e702a18e3
-SIZE (herbstluftwm-herbstluftwm-v0.9.4_GH0.tar.gz) = 452231
+TIMESTAMP = 1667198432
+SHA256 (herbstluftwm-0.9.5.tar.gz) = b2d4600909e5bece5ad63818dfb30bb19fd2ac9f52847b1a7a74ad4040718105
+SIZE (herbstluftwm-0.9.5.tar.gz) = 556773