diff --git a/htslib/Makefile b/htslib/Makefile
index 092a2ede94..26613b5602 100644
--- a/htslib/Makefile
+++ b/htslib/Makefile
@@ -3,8 +3,6 @@
 DISTNAME=	htslib-1.9
 CATEGORIES=	biology
 MASTER_SITES=	${MASTER_SITE_GITHUB:=samtools/}
-GITHUB_PROJECT=	htslib
-GITHUB_TAG=	${PKGVERSION_NOREV}
 
 MAINTAINER=	bacon@NetBSD.org
 HOMEPAGE=	http://www.htslib.org/
@@ -16,7 +14,7 @@ GNU_CONFIGURE=	yes
 REPLACE_PERL=	test/compare_sam.pl test/test.pl
 
 SUBST_CLASSES+=		version
-SUBST_STAGE.version=	post-patch
+SUBST_STAGE.version=	pre-configure
 SUBST_SED.version=	-e "s|m4_esyscmd_s(\[make print-version\])|[${PKGVERSION_NOREV}]|"
 SUBST_FILES.version=	${WRKSRC}/configure.ac