diff --git a/math/cm/Makefile b/math/cm/Makefile
index 5c83afcb7188..467370c6ffdf 100644
--- a/math/cm/Makefile
+++ b/math/cm/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	cm
-DISTVERSION=	0.3.1
-PORTREVISION=	1
+DISTVERSION=	0.4.0
 CATEGORIES=	math
 MASTER_SITES=	http://www.multiprecision.org/downloads/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for ring class fields of imaginary quadratic number fields
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr \
 		libmpfrcx.so:math/mpfrcx \
 		libpari.so:math/pari
 
 USES=		gmake libtool localbase
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
+TEST_TARGET=	check
 
 INFO=		cm
 
 .include <bsd.port.mk>
diff --git a/math/cm/distinfo b/math/cm/distinfo
index de69efb98cc7..5d11581a028b 100644
--- a/math/cm/distinfo
+++ b/math/cm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1609882958
-SHA256 (cm-0.3.1.tar.gz) = 82d4f4dc194738466888f70c2046bd934680b92aca8fa139927e85c567580663
-SIZE (cm-0.3.1.tar.gz) = 2471723
+TIMESTAMP = 1659329675
+SHA256 (cm-0.4.0.tar.gz) = 39a398f49240977ee79b8246ba7e6e8fde1fc4ad19e15c32b08050ec948d8312
+SIZE (cm-0.4.0.tar.gz) = 731818
diff --git a/math/cm/pkg-plist b/math/cm/pkg-plist
index 09ac5eb09318..127f91ac3941 100644
--- a/math/cm/pkg-plist
+++ b/math/cm/pkg-plist
@@ -1,31 +1,29 @@
 bin/classpol
 bin/cm
-include/cm_arith.h
-include/cm_class.h
-include/cm_common.h
-include/mpfpx.h
-lib/libcm_class.a
-lib/libcm_class.so
-lib/libcm_class.so.1
-lib/libcm_class.so.1.0.0
-lib/libcm_common.a
-lib/libcm_common.so
-lib/libcm_common.so.1
-lib/libcm_common.so.1.0.0
-lib/libmpfpx.a
-lib/libmpfpx.so
-lib/libmpfpx.so.0
-lib/libmpfpx.so.0.0.0
+bin/ecpp
+include/cm-arith.h
+include/cm.h
+lib/libcm.a
+lib/libcm.so
+lib/libcm.so.0
+lib/libcm.so.0.0.0
 %%DATADIR%%/af/af_0047.dat.gz
 %%DATADIR%%/af/af_0059.dat.gz
 %%DATADIR%%/af/af_0071.dat.gz
 %%DATADIR%%/af/af_0131.dat.gz
+%%DATADIR%%/df/df_0004.dat.gz
+%%DATADIR%%/df/df_0006.dat.gz
+%%DATADIR%%/df/df_0009.dat.gz
+%%DATADIR%%/df/df_0010.dat.gz
+%%DATADIR%%/df/df_0014.dat.gz
+%%DATADIR%%/df/df_0015.dat.gz
+%%DATADIR%%/df/df_0021.dat.gz
+%%DATADIR%%/df/df_0026.dat.gz
 %%DATADIR%%/df/df_0035.dat.gz
 %%DATADIR%%/df/df_0039.dat.gz
-%%DATADIR%%/df/df_0145.dat.gz
-%%DATADIR%%/df/df_0146.dat.gz
-%%DATADIR%%/df/df_0194.dat.gz
-%%DATADIR%%/df/df_0327.dat.gz
-%%DATADIR%%/df/df_0386.dat.gz
-%%DATADIR%%/df/df_0482.dat.gz
+%%DATADIR%%/mf/mf_0030.dat.gz
+%%DATADIR%%/mf/mf_0042.dat.gz
+%%DATADIR%%/mf/mf_0070.dat.gz
+%%DATADIR%%/mf/mf_0078.dat.gz
 %%DATADIR%%/mf/mf_0105.dat.gz
+%%DATADIR%%/mf/mf_0130.dat.gz
diff --git a/math/cmh/files/patch-src_lll.cpp b/math/cmh/files/patch-src_lll.cpp
deleted file mode 100644
index b02f6f5051e8..000000000000
--- a/math/cmh/files/patch-src_lll.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-- reported to Emmanuel Thomé <emmanuel.thome@inria.fr> on 06/06/2022
-
---- src/lll.cpp.orig	2021-02-05 17:21:58 UTC
-+++ src/lll.cpp
-@@ -37,7 +37,7 @@
- #ifdef HAVE_FPLLL
- static void lll_fplll (mpz_t *v, mpz_t **M, const int m, const int n)
- {
--   ZZ_mat <mpz_t> Mp (m, n);
-+   fplll::ZZ_mat <mpz_t> Mp (m, n);
-    int i, j;
- 
-    for (i = 0; i < m; i++)