diff --git a/math/gh-bc/Makefile b/math/gh-bc/Makefile
index 50d9191b5e9c..3ca62ee36e1d 100644
--- a/math/gh-bc/Makefile
+++ b/math/gh-bc/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=		bc
-PORTVERSION=		5.3.3
+PORTVERSION=		6.0.1
 CATEGORIES=		math lang
+MASTER_SITES=		https://github.com/gavinhoward/bc/releases/download/${PORTVERSION}/
 PKGNAMEPREFIX=		gh-
 
 MAINTAINER=		se@FreeBSD.org
 COMMENT=		GNU compatible bc/dc calculator
 
 LICENSE=		BSD2CLAUSE MIT
 LICENSE_COMB=		multi
 LICENSE_FILE=		${WRKSRC}/LICENSE.md
 
-USES=			compiler:c11
-USE_GITHUB=		yes
-GH_ACCOUNT=		gavinhoward
-GH_TAGNAME=		eb0cd870b9
+USES=			compiler:c11 tar:xz
 
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	configure.sh
-CONFIGURE_ARGS+=	--disable-generated-tests
+CONFIGURE_ARGS+=	--predefined-build-type=BSD
 
 TEST_TARGET=		test
 
 CONFLICTS_INSTALL=	gnubc
 
 OPTIONS_DEFAULT=	LIBEDIT
 OPTIONS_RADIO=		HISTORY
 OPTIONS_RADIO_HISTORY=	LIBEDIT READLINE INTERNAL
 INTERNAL_DESC=		Command line editing via private functions
 
+INTERNAL_CONFIGURE_ON=	--enable-internal-history
+
 LIBEDIT_USES=		libedit
 LIBEDIT_CONFIGURE_ON=	--enable-editline
 
 READLINE_USES=		readline
 READLINE_CONFIGURE_ON=	--enable-readline
 
 pre-build:
 		${INSTALL_SCRIPT} ${WRKSRC}/gen/strgen.sh ${WRKSRC}/gen/strgen
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/bin/bc ${STAGEDIR}${PREFIX}/bin/
 		${LN} ${STAGEDIR}${PREFIX}/bin/bc ${STAGEDIR}${PREFIX}/bin/dc
 		${INSTALL_MAN} ${WRKSRC}/manuals/bc.1 ${STAGEDIR}${MANPREFIX}/share/man/man1
 		${INSTALL_MAN} ${WRKSRC}/manuals/dc.1 ${STAGEDIR}${MANPREFIX}/share/man/man1
 		${MKDIR} ${STAGEDIR}${PREFIX}/share/nls/C
 		${WRKSRC}/scripts/locale_install.sh ${STAGEDIR}${PREFIX}/share/nls/%L/%N.cat ${PORTNAME}
 		${MV} ${STAGEDIR}${PREFIX}/share/nls/en_US/bc.cat ${STAGEDIR}${PREFIX}/share/nls/C/
 		${RMDIR} ${STAGEDIR}${PREFIX}/share/nls/en_US
 
 .include <bsd.port.mk>
diff --git a/math/gh-bc/distinfo b/math/gh-bc/distinfo
index 571ff94945d1..0cd7bd09f73a 100644
--- a/math/gh-bc/distinfo
+++ b/math/gh-bc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1656182840
-SHA256 (gavinhoward-bc-5.3.3-eb0cd870b9_GH0.tar.gz) = 46f83e86f688aaf573b0e26759a9f29961018ed275b0ae014f90058773f0aeff
-SIZE (gavinhoward-bc-5.3.3-eb0cd870b9_GH0.tar.gz) = 1209761
+TIMESTAMP = 1659886979
+SHA256 (bc-6.0.1.tar.xz) = a37df8b9a199f6a370367432101ed6f2cc02a5521696ce3c624acb150320c453
+SIZE (bc-6.0.1.tar.xz) = 451076