diff --git a/math/alglib/Makefile b/math/alglib/Makefile
index ca8cbb820072..345c824d13b1 100644
--- a/math/alglib/Makefile
+++ b/math/alglib/Makefile
@@ -1,26 +1,32 @@
 PORTNAME=	alglib
-DISTVERSION=	3.17.0
+DISTVERSION=	3.18.0
 CATEGORIES=	math science
 MASTER_SITES=	https://www.alglib.net/translator/re/
 EXTRACT_SUFX=	.cpp.gpl.zip
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Numerical analysis and data processing library
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/gpl3.txt
 
 USE_LDCONFIG=	yes
-WRKSRC=		${WRKDIR}/cpp
+WRKSRC=		${WRKDIR}/${PORTNAME}-cpp
 
 do-build:
 	cd ${WRKSRC}/src && \
 		${CXX} ${CXXFLAGS} -fPIC -Wl,-soname,lib${PORTNAME}.so.3 -shared -o lib${PORTNAME}.so.3 *.cpp
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/lib${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/src/*.h ${STAGEDIR}${PREFIX}/include/lib${PORTNAME}
 	${INSTALL_LIB} ${WRKSRC}/src/lib${PORTNAME}.so.3 ${STAGEDIR}${PREFIX}/lib
 	@${LN} -s lib${PORTNAME}.so.3 ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
 
+do-test:
+	@cd ${WRKSRC} && \
+		cd tests && \
+		${CXX} ${CXXFLAGS} test_c.cpp -I ${STAGEDIR}${LOCALBASE}/include/libalglib ${STAGEDIR}${LOCALBASE}/lib/lib${PORTNAME}.so && \
+		LD_PRELOAD=${STAGEDIR}${LOCALBASE}/lib/lib${PORTNAME}.so ./a.out
+
 .include <bsd.port.mk>
diff --git a/math/alglib/distinfo b/math/alglib/distinfo
index 309190837cbb..65055984ff22 100644
--- a/math/alglib/distinfo
+++ b/math/alglib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1609303656
-SHA256 (alglib-3.17.0.cpp.gpl.zip) = 96d61e8ad68e715dfada6aa25eef014eb14d59573809b84e3e393dbf896d40a7
-SIZE (alglib-3.17.0.cpp.gpl.zip) = 3076017
+TIMESTAMP = 1636274405
+SHA256 (alglib-3.18.0.cpp.gpl.zip) = b9045b3c569d351a6bc093ee0166cb72003aca92dc0f95cb7076d3b32dd58c0c
+SIZE (alglib-3.18.0.cpp.gpl.zip) = 3175116
diff --git a/math/alglib/pkg-plist b/math/alglib/pkg-plist
index 04b5a75cedf4..87da94742d57 100644
--- a/math/alglib/pkg-plist
+++ b/math/alglib/pkg-plist
@@ -1,16 +1,19 @@
 include/libalglib/alglibinternal.h
 include/libalglib/alglibmisc.h
 include/libalglib/ap.h
 include/libalglib/dataanalysis.h
 include/libalglib/diffequations.h
 include/libalglib/fasttransforms.h
 include/libalglib/integration.h
 include/libalglib/interpolation.h
+include/libalglib/kernels_avx2.h
+include/libalglib/kernels_fma.h
+include/libalglib/kernels_sse2.h
 include/libalglib/linalg.h
 include/libalglib/optimization.h
 include/libalglib/solvers.h
 include/libalglib/specialfunctions.h
 include/libalglib/statistics.h
 include/libalglib/stdafx.h
 lib/libalglib.so
 lib/libalglib.so.3