diff --git a/devel/volk/Makefile b/devel/volk/Makefile
index f1387a155ba5..721af3bcf432 100644
--- a/devel/volk/Makefile
+++ b/devel/volk/Makefile
@@ -1,21 +1,23 @@
 PORTNAME=	volk
-DISTVERSIONPREFIX=	v
-DISTVERSION=	2.2.1
+DISTVERSION=	2.5.0
 CATEGORIES=	devel comms hamradio
+MASTER_SITES=	https://github.com/gnuradio/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Vector-Optimized Library of Kernels
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	liborc-0.4.so:devel/orc
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/mako/__init__.py:textproc/py-mako@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mako>=0.4.2:textproc/py-mako@${PY_FLAVOR}
+LIB_DEPENDS=	liborc-0.4.so:devel/orc \
+		libboost_filesystem.so:devel/boost-libs
 
-USES=		cmake compiler:c++11-lang python:3.5+
+USES=		cmake compiler:c++17-lang python:3.6+ tar:xz
+USE_LDCONFIG=	yes
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	gnuradio
+TEST_TARGET=	test
 
-USE_LDCONFIG=	yes
+CMAKE_OFF=	VOLK_CPU_FEATURES
 
 .include <bsd.port.mk>
diff --git a/devel/volk/distinfo b/devel/volk/distinfo
index 14a6a5bc1cf5..2be0f51a01b3 100644
--- a/devel/volk/distinfo
+++ b/devel/volk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1585921652
-SHA256 (gnuradio-volk-v2.2.1_GH0.tar.gz) = 283d088f93774a55cb8be058b3d3b4a06d8bd44d6bc0016416f5a7818dd05db4
-SIZE (gnuradio-volk-v2.2.1_GH0.tar.gz) = 330676
+TIMESTAMP = 1623436325
+SHA256 (volk-2.5.0.tar.xz) = ddc84d2396e9d3899ff0411a0659f64ba19d75b2210cce83bc2eaa7767429252
+SIZE (volk-2.5.0.tar.xz) = 322280
diff --git a/devel/volk/pkg-plist b/devel/volk/pkg-plist
index e7431b64835b..a826b23db52c 100644
--- a/devel/volk/pkg-plist
+++ b/devel/volk/pkg-plist
@@ -38,12 +38,14 @@ include/volk/volk_32f_binary_slicer_8i.h
 include/volk/volk_32f_convert_64f.h
 include/volk/volk_32f_cos_32f.h
 include/volk/volk_32f_expfast_32f.h
+include/volk/volk_32f_exp_32f.h
 include/volk/volk_32f_index_max_16u.h
 include/volk/volk_32f_index_max_32u.h
 include/volk/volk_32f_invsqrt_32f.h
 include/volk/volk_32f_log2_32f.h
 include/volk/volk_32f_null_32f.h
 include/volk/volk_32f_s32f_32f_fm_detect_32f.h
+include/volk/volk_32f_s32f_add_32f.h
 include/volk/volk_32f_s32f_calc_spectral_noise_floor_32f.h
 include/volk/volk_32f_s32f_convert_16i.h
 include/volk/volk_32f_s32f_convert_32i.h
@@ -75,6 +77,7 @@ include/volk/volk_32f_x3_sum_of_poly_32f.h
 include/volk/volk_32fc_32f_add_32fc.h
 include/volk/volk_32fc_32f_dot_prod_32fc.h
 include/volk/volk_32fc_32f_multiply_32fc.h
+include/volk/volk_32fc_accumulator_s32fc.h
 include/volk/volk_32fc_conjugate_32fc.h
 include/volk/volk_32fc_convert_16ic.h
 include/volk/volk_32fc_deinterleave_32f_x2.h
@@ -90,6 +93,7 @@ include/volk/volk_32fc_s32f_atan2_32f.h
 include/volk/volk_32fc_s32f_deinterleave_real_16i.h
 include/volk/volk_32fc_s32f_magnitude_16i.h
 include/volk/volk_32fc_s32f_power_32fc.h
+include/volk/volk_32fc_s32f_power_spectral_densitypuppet_32f.h
 include/volk/volk_32fc_s32f_power_spectrum_32f.h
 include/volk/volk_32fc_s32f_x2_power_spectral_density_32f.h
 include/volk/volk_32fc_s32fc_multiply_32fc.h
@@ -154,7 +158,8 @@ lib/cmake/volk/VolkConfigVersion.cmake
 lib/cmake/volk/VolkTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/volk/VolkTargets.cmake
 lib/libvolk.so
-lib/libvolk.so.2.2.1
+lib/libvolk.so.2.5
+lib/libvolk.so.2.5.0
 %%PYTHON_SITELIBDIR%%/volk_modtool/__init__.py
 %%PYTHON_SITELIBDIR%%/volk_modtool/__init__.pyc
 %%PYTHON_SITELIBDIR%%/volk_modtool/__init__.pyo