diff --git a/math/mprime/Makefile b/math/mprime/Makefile
index cd8a60c0f74a..d7ae3a4fa4d6 100644
--- a/math/mprime/Makefile
+++ b/math/mprime/Makefile
@@ -1,62 +1,62 @@
 # Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 
 PORTNAME=	mprime
-PORTVERSION=	29.8b3
-PORTREVISION=	2
+PORTVERSION=	30.7b9
 CATEGORIES=	math benchmarks net
 MASTER_SITES=	http://www.mersenne.org/ftp_root/gimps/ \
 		ftp://mersenne.org/gimps/
 DISTNAME=	p95v${PORTVERSION:R}${PORTVERSION:E}.source
 
 MAINTAINER=	rozhuk.im@gmail.com
 COMMENT=	Great Internet Mersenne Prime Search
 
 LICENSE=	EULA
 LICENSE_NAME=	EULA
 LICENSE_FILE=	${FILESDIR}/LICENSE
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
 ONLY_FOR_ARCHS=	amd64 i386
 
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/circular_buffer.hpp:devel/boost-libs
 LIB_DEPENDS=	libcurl.so:ftp/curl					\
 		libhwloc.so.15:devel/hwloc2				\
 		libgmp.so:math/gmp
 
 USES=		zip
 
 NO_WRKSUBDIR=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 MAKEFILE=	makebsd
 ALL_TARGET=	mprime
 LLD_UNSAFE=	yes
 
 SUB_FILES=	wrapper.sh
 
 PLIST_FILES+=	bin/mprime bin/mprime-real
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
 WRKSRC_SUBDIR=	linux64
 .else
 WRKSRC_SUBDIR=	linux
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 		${PATCH_WRKSRC}/linux64/makebsd \
 		${PATCH_WRKSRC}/linux/makebsd
 
 pre-build:
 .if ${ARCH} == "amd64"
 	@${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${PATCH_WRKSRC}/gwnum ${MAKE_FLAGS} makebsd64 ${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g}
 .elif ${ARCH} == "i386"
 	@${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${PATCH_WRKSRC}/gwnum ${MAKE_FLAGS} makemsys ${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g}
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mprime ${STAGEDIR}${PREFIX}/bin/mprime-real
 	${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${STAGEDIR}${PREFIX}/bin/mprime
 
 .include <bsd.port.post.mk>
diff --git a/math/mprime/distinfo b/math/mprime/distinfo
index 97b9e2206069..b7cb84ef5375 100644
--- a/math/mprime/distinfo
+++ b/math/mprime/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557620197
-SHA256 (p95v298b3.source.zip) = dac67702e45689e058519164222b6a1f0b32d9e7c88049f7c59f9699174105f0
-SIZE (p95v298b3.source.zip) = 51553788
+TIMESTAMP = 1656319706
+SHA256 (p95v307b9.source.zip) = e89ce78b01eb3055f5503eabd9d0aec95e1e832361f3f2987098969fe649fdb5
+SIZE (p95v307b9.source.zip) = 50929924
diff --git a/math/mprime/files/patch-gwnum_makemsys b/math/mprime/files/patch-gwnum_makemsys
index eb44521b1be7..813bc31b1981 100644
--- a/math/mprime/files/patch-gwnum_makemsys
+++ b/math/mprime/files/patch-gwnum_makemsys
@@ -1,27 +1,21 @@
 --- gwnum/makemsys.orig	2019-04-23 03:05:20 UTC
 +++ gwnum/makemsys
-@@ -1,13 +1,13 @@
- # Makefile for Mingw/msys gwnum library
+@@ -2,10 +2,10 @@
  #
  
--CC = gcc
--CFLAGS = -I.. -I../sqlite-amalgamation-3180000 -O2 -march=i486 -malign-double
-+CC ?= cc
+ CC ?= cc
+-CFLAGS = -I.. -I../sqlite-amalgamation-3180000 -O2 -march=i486
 +CFLAGS += -I.. -I../sqlite-amalgamation-3180000 -O2 -march=i486
  
--CPP = g++
--CPPFLAGS = -I.. -I../qd -O2 -march=i486 -malign-double
-+CXX ?= cc
+ CXX ?= cc
+-CXXFLAGS = -I.. -I../qd -O2 -march=i486
 +CXXFLAGS += -I.. -I../qd -O2 -march=i486
  
--AR = ar
-+AR ?= ar
- 
- LINUXOBJS = cpuid.o gwnum.o gwtables.o gwthread.o gwini.o gwbench.o gwutil.o gwdbldbl.o giants.o ecmstag1.o
+ AR ?= ar
  
 @@ -29,4 +29,4 @@ distclean: clean
  	$(CC) $(CFLAGS) -c $<
  
  .cpp.o:
 -	$(CPP) $(CPPFLAGS) -c $<
 +	$(CXX) $(CXXFLAGS) -c $<
diff --git a/math/mprime/files/patch-linux_makebsd b/math/mprime/files/patch-linux_makebsd
deleted file mode 100644
index 7b70252a90df..000000000000
--- a/math/mprime/files/patch-linux_makebsd
+++ /dev/null
@@ -1,20 +0,0 @@
---- linux/makebsd.orig	2019-04-23 03:05:22 UTC
-+++ linux/makebsd
-@@ -7,13 +7,13 @@
- #
- 
- CC ?= cc
--CFLAGS += -I.. -I../gwnum -I$(LOCALBASE)/include -O2 -march=i486 -malign-double
-+CFLAGS += -I.. -I../gwnum -I$(LOCALBASE)/include -O2 -march=i486
- 
- CXX ?= cc
--CXXFLAGS += -I.. -I../gwnum -I$(LOCALBASE)/include -O2 -march=i486 -malign-double
-+CXXFLAGS += -I.. -I../gwnum -I$(LOCALBASE)/include -O2 -march=i486
- 
--LDFLAGS += -fpie -Wl,-M -L$(LOCALBASE)/lib
--LIBS += ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic -lhwloc -Wl,-Bstatic -lcurl -lz -lcompat -lstdc++ -Wl,-Bdynamic -lssl -lgmp
-+LDFLAGS += -fpie -L$(LOCALBASE)/lib -Wl,-M
-+LIBS += ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -lhwloc -lcurl -lstdc++ -lcompat -lgmp
- 
- FACTOROBJ = factor32.o
- OBJS = prime.o menu.o