diff --git a/math/gh-bc/Makefile b/math/gh-bc/Makefile
index a4e5b3b97e84..ebdb996e7011 100644
--- a/math/gh-bc/Makefile
+++ b/math/gh-bc/Makefile
@@ -1,42 +1,49 @@
-PORTNAME=	bc
-PORTVERSION=	5.2.5
-CATEGORIES=	math lang
-PKGNAMEPREFIX=	gh-
+PORTNAME=		bc
+PORTVERSION=		5.3.1
+CATEGORIES=		math lang
+PKGNAMEPREFIX=		gh-
 
-MAINTAINER=	se@FreeBSD.org
-COMMENT=	GNU compatible bc/dc calculator
+MAINTAINER=		se@FreeBSD.org
+COMMENT=		GNU compatible bc/dc calculator
 
-LICENSE=	BSD2CLAUSE MIT
-LICENSE_COMB=	multi
-LICENSE_FILE=	${WRKSRC}/LICENSE.md
+LICENSE=		BSD2CLAUSE MIT
+LICENSE_COMB=		multi
+LICENSE_FILE=		${WRKSRC}/LICENSE.md
 
-USES=		compiler:c11
-USE_GITHUB=	yes
-GH_ACCOUNT=	gavinhoward
+USES=			compiler:c11
+USE_GITHUB=		yes
+GH_ACCOUNT=		gavinhoward
 
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	configure.sh
-CONFIGURE_ARGS=		-G
-CFLAGS+=		-Dstatic_assert=_Static_assert
+CONFIGURE_ARGS+=	--disable-generated-tests
 
-.include <bsd.port.pre.mk>
+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
+
+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
 
-do-test:
-		${MAKE} -C ${WRKSRC} test
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/gh-bc/distinfo b/math/gh-bc/distinfo
index b4f705d2a374..ab478c2b2082 100644
--- a/math/gh-bc/distinfo
+++ b/math/gh-bc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1651425342
-SHA256 (gavinhoward-bc-5.2.5_GH0.tar.gz) = 54f50354032f3e05c84d80b4de28e1ff15cfdbdaa0f67072b6bc3f8cceb7f2c6
-SIZE (gavinhoward-bc-5.2.5_GH0.tar.gz) = 1191677
+TIMESTAMP = 1654942032
+SHA256 (gavinhoward-bc-5.3.1_GH0.tar.gz) = a8edcf6c0deb1ffe88eeec4bf5b9c4584028e3ad18ccef6998130174c1c80737
+SIZE (gavinhoward-bc-5.3.1_GH0.tar.gz) = 1210239