diff --git a/devel/xsimd/Makefile b/devel/xsimd/Makefile
index 3543a44378743..e3e2944b7e3cd 100644
--- a/devel/xsimd/Makefile
+++ b/devel/xsimd/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	xsimd
-DISTVERSION=	7.6.0
+DISTVERSION=	8.0.5
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/xsimd/distinfo b/devel/xsimd/distinfo
index 2f9c80e6e30f7..fd77e1d49859c 100644
--- a/devel/xsimd/distinfo
+++ b/devel/xsimd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1627836280
-SHA256 (xtensor-stack-xsimd-7.6.0_GH0.tar.gz) = eaf47f1a316ef6c3287b266161eeafc5aa61226ce5ac6c13502546435b790252
-SIZE (xtensor-stack-xsimd-7.6.0_GH0.tar.gz) = 208651
+TIMESTAMP = 1641273247
+SHA256 (xtensor-stack-xsimd-8.0.5_GH0.tar.gz) = 0e1b5d973b63009f06a3885931a37452580dbc8d7ca8ad40d4b8c80d2a0f84d7
+SIZE (xtensor-stack-xsimd-8.0.5_GH0.tar.gz) = 176489
diff --git a/devel/xsimd/pkg-plist b/devel/xsimd/pkg-plist
index a418a0afd5505..2e675916a1b3e 100644
--- a/devel/xsimd/pkg-plist
+++ b/devel/xsimd/pkg-plist
@@ -1,86 +1,61 @@
-include/xsimd/config/xsimd_align.hpp
+include/xsimd/arch/generic/xsimd_generic_arithmetic.hpp
+include/xsimd/arch/generic/xsimd_generic_complex.hpp
+include/xsimd/arch/generic/xsimd_generic_details.hpp
+include/xsimd/arch/generic/xsimd_generic_logical.hpp
+include/xsimd/arch/generic/xsimd_generic_math.hpp
+include/xsimd/arch/generic/xsimd_generic_memory.hpp
+include/xsimd/arch/generic/xsimd_generic_rounding.hpp
+include/xsimd/arch/generic/xsimd_generic_trigo.hpp
+include/xsimd/arch/xsimd_avx.hpp
+include/xsimd/arch/xsimd_avx2.hpp
+include/xsimd/arch/xsimd_avx512bw.hpp
+include/xsimd/arch/xsimd_avx512cd.hpp
+include/xsimd/arch/xsimd_avx512dq.hpp
+include/xsimd/arch/xsimd_avx512f.hpp
+include/xsimd/arch/xsimd_constants.hpp
+include/xsimd/arch/xsimd_fma3.hpp
+include/xsimd/arch/xsimd_fma4.hpp
+include/xsimd/arch/xsimd_fma5.hpp
+include/xsimd/arch/xsimd_generic.hpp
+include/xsimd/arch/xsimd_generic_fwd.hpp
+include/xsimd/arch/xsimd_isa.hpp
+include/xsimd/arch/xsimd_neon.hpp
+include/xsimd/arch/xsimd_neon64.hpp
+include/xsimd/arch/xsimd_scalar.hpp
+include/xsimd/arch/xsimd_sse2.hpp
+include/xsimd/arch/xsimd_sse3.hpp
+include/xsimd/arch/xsimd_sse4_1.hpp
+include/xsimd/arch/xsimd_sse4_2.hpp
+include/xsimd/arch/xsimd_ssse3.hpp
+include/xsimd/config/xsimd_arch.hpp
 include/xsimd/config/xsimd_config.hpp
-include/xsimd/config/xsimd_include.hpp
-include/xsimd/config/xsimd_instruction_set.hpp
-include/xsimd/math/xsimd_basic_math.hpp
-include/xsimd/math/xsimd_error.hpp
-include/xsimd/math/xsimd_estrin.hpp
-include/xsimd/math/xsimd_exp_reduction.hpp
-include/xsimd/math/xsimd_exponential.hpp
-include/xsimd/math/xsimd_fp_manipulation.hpp
-include/xsimd/math/xsimd_fp_sign.hpp
-include/xsimd/math/xsimd_gamma.hpp
-include/xsimd/math/xsimd_horner.hpp
-include/xsimd/math/xsimd_hyperbolic.hpp
-include/xsimd/math/xsimd_invtrigo.hpp
-include/xsimd/math/xsimd_logarithm.hpp
-include/xsimd/math/xsimd_math.hpp
-include/xsimd/math/xsimd_math_complex.hpp
-include/xsimd/math/xsimd_numerical_constant.hpp
-include/xsimd/math/xsimd_power.hpp
+include/xsimd/config/xsimd_cpuid.hpp
 include/xsimd/math/xsimd_rem_pio2.hpp
-include/xsimd/math/xsimd_rounding.hpp
-include/xsimd/math/xsimd_trigo_reduction.hpp
-include/xsimd/math/xsimd_trigonometric.hpp
 include/xsimd/memory/xsimd_aligned_allocator.hpp
-include/xsimd/memory/xsimd_aligned_stack_buffer.hpp
 include/xsimd/memory/xsimd_alignment.hpp
-include/xsimd/memory/xsimd_load_store.hpp
 include/xsimd/stl/algorithms.hpp
-include/xsimd/stl/iterator.hpp
-include/xsimd/types/xsimd_avx512_bool.hpp
-include/xsimd/types/xsimd_avx512_complex.hpp
-include/xsimd/types/xsimd_avx512_conversion.hpp
-include/xsimd/types/xsimd_avx512_double.hpp
-include/xsimd/types/xsimd_avx512_float.hpp
-include/xsimd/types/xsimd_avx512_int16.hpp
-include/xsimd/types/xsimd_avx512_int32.hpp
-include/xsimd/types/xsimd_avx512_int64.hpp
-include/xsimd/types/xsimd_avx512_int8.hpp
-include/xsimd/types/xsimd_avx512_int_base.hpp
-include/xsimd/types/xsimd_avx_complex.hpp
-include/xsimd/types/xsimd_avx_conversion.hpp
-include/xsimd/types/xsimd_avx_double.hpp
-include/xsimd/types/xsimd_avx_float.hpp
-include/xsimd/types/xsimd_avx_int16.hpp
-include/xsimd/types/xsimd_avx_int32.hpp
-include/xsimd/types/xsimd_avx_int64.hpp
-include/xsimd/types/xsimd_avx_int8.hpp
-include/xsimd/types/xsimd_avx_int_base.hpp
-include/xsimd/types/xsimd_base.hpp
-include/xsimd/types/xsimd_base_bool.hpp
-include/xsimd/types/xsimd_base_constant.hpp
-include/xsimd/types/xsimd_common_math.hpp
-include/xsimd/types/xsimd_complex_base.hpp
-include/xsimd/types/xsimd_fallback.hpp
-include/xsimd/types/xsimd_int_conversion.hpp
-include/xsimd/types/xsimd_neon_bool.hpp
-include/xsimd/types/xsimd_neon_complex.hpp
-include/xsimd/types/xsimd_neon_conversion.hpp
-include/xsimd/types/xsimd_neon_double.hpp
-include/xsimd/types/xsimd_neon_float.hpp
-include/xsimd/types/xsimd_neon_int16.hpp
-include/xsimd/types/xsimd_neon_int32.hpp
-include/xsimd/types/xsimd_neon_int64.hpp
-include/xsimd/types/xsimd_neon_int8.hpp
-include/xsimd/types/xsimd_neon_int_base.hpp
-include/xsimd/types/xsimd_neon_uint16.hpp
-include/xsimd/types/xsimd_neon_uint32.hpp
-include/xsimd/types/xsimd_neon_uint64.hpp
-include/xsimd/types/xsimd_neon_uint8.hpp
-include/xsimd/types/xsimd_neon_utils.hpp
-include/xsimd/types/xsimd_scalar.hpp
-include/xsimd/types/xsimd_sse_complex.hpp
-include/xsimd/types/xsimd_sse_conversion.hpp
-include/xsimd/types/xsimd_sse_double.hpp
-include/xsimd/types/xsimd_sse_float.hpp
-include/xsimd/types/xsimd_sse_int16.hpp
-include/xsimd/types/xsimd_sse_int32.hpp
-include/xsimd/types/xsimd_sse_int64.hpp
-include/xsimd/types/xsimd_sse_int8.hpp
-include/xsimd/types/xsimd_sse_int_base.hpp
+include/xsimd/types/xsimd_all_registers.hpp
+include/xsimd/types/xsimd_api.hpp
+include/xsimd/types/xsimd_avx2_register.hpp
+include/xsimd/types/xsimd_avx512bw_register.hpp
+include/xsimd/types/xsimd_avx512cd_register.hpp
+include/xsimd/types/xsimd_avx512dq_register.hpp
+include/xsimd/types/xsimd_avx512f_register.hpp
+include/xsimd/types/xsimd_avx_register.hpp
+include/xsimd/types/xsimd_batch.hpp
+include/xsimd/types/xsimd_batch_constant.hpp
+include/xsimd/types/xsimd_fma3_register.hpp
+include/xsimd/types/xsimd_fma5_register.hpp
+include/xsimd/types/xsimd_generic_arch.hpp
+include/xsimd/types/xsimd_neon64_register.hpp
+include/xsimd/types/xsimd_neon_register.hpp
+include/xsimd/types/xsimd_register.hpp
+include/xsimd/types/xsimd_sse2_register.hpp
+include/xsimd/types/xsimd_sse3_register.hpp
+include/xsimd/types/xsimd_sse4_1_register.hpp
+include/xsimd/types/xsimd_sse4_2_register.hpp
+include/xsimd/types/xsimd_ssse3_register.hpp
 include/xsimd/types/xsimd_traits.hpp
-include/xsimd/types/xsimd_types_include.hpp
 include/xsimd/types/xsimd_utils.hpp
 include/xsimd/xsimd.hpp
 lib/cmake/xsimd/xsimdConfig.cmake