diff --git a/sys-cluster/shuffile/Manifest b/sys-cluster/shuffile/Manifest
index e4993c8033..286531b32f 100644
--- a/sys-cluster/shuffile/Manifest
+++ b/sys-cluster/shuffile/Manifest
@@ -1 +1,2 @@
 DIST shuffile-0.0.4.tar.gz 28847 BLAKE2B 7e36c8d96457eb44f59f9017d69ad53265d88c47b33d37b8b2ab6ea2365eb2bd0eb78a25a2496754d839ae5507615356e2cb5508879b82c99e2ef91ef9f7af0e SHA512 2c90e1aa852413f15fabc78c0553344b1b8975972ff84239d872738f102d7784f16422ccc2807189307db0feb0abb28b4db02c1666957a94a92e6be329f4a277
+DIST shuffile-0.1.0.tar.gz 28999 BLAKE2B bd8b972d75740ece74de91aa4a2bafad3ce1fc6ed3bd93d5ef4ad7df2264cb7abc26e37b2985bc79219163e1817f3925d76d828ff5a83677b4d601b161fc1d83 SHA512 750eb38a303dea5bb97ad72fcb040fb49c3c059ae974218fbeeaa23a3aa0296d971af45636895a099c719c1eed120e747c1fc06be8d77c0b3d948f89b8586c22
diff --git a/sys-cluster/shuffile/files/shuffile-0.1.0-no-static.patch b/sys-cluster/shuffile/files/shuffile-0.1.0-no-static.patch
new file mode 100644
index 0000000000..c8b334b6ad
--- /dev/null
+++ b/sys-cluster/shuffile/files/shuffile-0.1.0-no-static.patch
@@ -0,0 +1,16 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -26,13 +26,3 @@
+    SET_TARGET_PROPERTIES(shuffile PROPERTIES OUTPUT_NAME shuffile CLEAN_DIRECT_OUTPUT 1)
+    INSTALL(TARGETS shuffile DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF()
+-
+-ADD_LIBRARY(shuffile-static STATIC $<TARGET_OBJECTS:shuffile_o>)
+-IF(KVTREE_LINK_STATIC)
+-        SET_TARGET_PROPERTIES(shuffile-static PROPERTIES LINK_SEARCH_START_STATIC 1)
+-        SET_TARGET_PROPERTIES(shuffile-static PROPERTIES LINK_SEARCH_END_STATIC 1)
+-ENDIF(KVTREE_LINK_STATIC)
+-TARGET_LINK_LIBRARIES(shuffile-static ${SHUFFILE_EXTERNAL_LIBS})
+-
+-SET_TARGET_PROPERTIES(shuffile-static PROPERTIES OUTPUT_NAME shuffile CLEAN_DIRECT_OUTPUT 1)
+-INSTALL(TARGETS shuffile-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/sys-cluster/shuffile/shuffile-0.1.0.ebuild b/sys-cluster/shuffile/shuffile-0.1.0.ebuild
new file mode 100644
index 0000000000..3887585e49
--- /dev/null
+++ b/sys-cluster/shuffile/shuffile-0.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="SHUFFILE Shuffle files between processes"
+HOMEPAGE="https://github.com/ECP-VeloC/shuffile"
+SRC_URI="https://github.com/ECP-VeloC/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	>=sys-cluster/KVTree-1.0.2[mpi]
+	sys-libs/zlib
+	virtual/mpi
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/cmake-2.8
+"
+
+PATCHES=( "${FILESDIR}/${P}-no-static.patch" )
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DENABLE_TESTS=$(usex test)
+		-DSHUFFILE_LINK_STATIC=OFF
+	)
+	cmake_src_configure
+}