diff --git a/sys-cluster/veloc/Manifest b/sys-cluster/veloc/Manifest
index 33ca5a480a..cf92618f73 100644
--- a/sys-cluster/veloc/Manifest
+++ b/sys-cluster/veloc/Manifest
@@ -1 +1,2 @@
 DIST veloc-1.5.tar.gz 252563 BLAKE2B 03e5957990f449e7e3ac9a543ce1317c2347e965c455dcd29d0ed525c93d3e4134592cce73fa388af807c293e8ba7db3943dd039400b86878b7bc91b4956a76d SHA512 618d30b9e1e28882fdb3559bd65ed52b2541dcd1aeb04fcc2943ed96501fa3219c8a3dc32861f1c14454e6e42a6a04b1affd1472a770be9e7ae4525eb43cc755
+DIST veloc-1.6.tar.gz 243253 BLAKE2B 38f2878481a5895d3b73bfb9ae6cb7a59b2231b465ca8c31c2bcfa02cef27f74fd09482a52a90ece8ae67f4a4555f696ac3391d48bd45c847df2c78c1f19eae1 SHA512 d09b748d5e85212a3abbbe1b3fc554b6a612a1fd1af2b384836af571112007e1b3354a243633cee9794f49124f539caec4f9a941e64ce5b3cc052a6e5b4cba95
diff --git a/sys-cluster/veloc/files/veloc-1.6-strip-cflags.patch b/sys-cluster/veloc/files/veloc-1.6-strip-cflags.patch
new file mode 100644
index 0000000000..0367ee53f5
--- /dev/null
+++ b/sys-cluster/veloc/files/veloc-1.6-strip-cflags.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,7 +4,7 @@
+ ##### Global settings
+ include(GNUInstallDirs)
+ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
+-add_definitions(-O2 -g -Wall -D__BENCHMARK -D__ASSERT -D__INFO)
++add_definitions( -Wall -D__BENCHMARK -D__ASSERT -D__INFO)
+ set(CMAKE_CXX_STANDARD 17)
+ 
+ ##### Configuration setting
diff --git a/sys-cluster/veloc/veloc-1.6.ebuild b/sys-cluster/veloc/veloc-1.6.ebuild
new file mode 100644
index 0000000000..3317e524e0
--- /dev/null
+++ b/sys-cluster/veloc/veloc-1.6.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake distutils-r1
+
+DESCRIPTION="Very-Low Overhead Checkpointing System"
+HOMEPAGE="https://github.com/ECP-VeloC/VELOC"
+SRC_URI="https://github.com/ECP-VeloC/VELOC/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN^^}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE_COMM_QUEUE="
+	+comm-queue-ipc
+	comm-queue-socket
+"
+#	comm-queue-thallium
+IUSE="${IUSE_COMM_QUEUE} python +slurm"
+
+# AXL is optional
+RDEPEND="
+	comm-queue-ipc? ( dev-libs/boost )
+	slurm? ( sys-cluster/slurm )
+
+	dev-libs/openssl
+	<sys-cluster/AXL-0.4.0
+	sys-cluster/er
+	virtual/mpi
+"
+#	comm-queue-thallium? ( thallium )
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-strip-cflags.patch" )
+REQUIRED_USE="
+	^^ ( ${IUSE_COMM_QUEUE/+/} )
+"
+
+distutils_enable_sphinx "${S}/docs" --no-autodoc
+distutils_enable_tests pytest
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local resman="NONE"
+	use slurm && resman="SLURM"
+
+	local queue
+	use comm-queue-ipc && queue="ipc_queue"
+	use comm-queue-socket && queue="socket_queue"
+#	use comm-queue-thallium && queue="thallium_queue"
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
+		-DCOMM_QUEUE="${queue}"
+		-DVELOC_RESOURCE_MANAGER="${resman}"
+		-DX_LIBDIR="$(get_libdir)"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use python; then
+		pushd "src/bindings/python" || die
+		distutils-r1_src_compile
+		popd || die
+	else
+		# If USE="-python doc" we still
+		# want to compile the doc files
+		sphinx_compile_all
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	if use python; then
+		pushd "${S}/src/bindings/python" || die
+		distutils-r1_src_install
+		popd || die
+	fi
+}
+
+src_test() {
+	cd test
+	default
+	if use python; then
+		pushd "${S}/src/bindings/python" || die
+#		python_test() {
+#			"${EPYTHON}" test.py -v || die
+#		}
+		distutils-r1_src_test
+		popd || die
+	fi
+}