diff --git a/sys-cluster/shuffile/Manifest b/sys-cluster/shuffile/Manifest
index 999e3b0bb3..92a861245f 100644
--- a/sys-cluster/shuffile/Manifest
+++ b/sys-cluster/shuffile/Manifest
@@ -1 +1,2 @@
 DIST shuffile-0.0.3.tar.gz 20069 BLAKE2B cb40b12334e7ec2f70140d6d2cb11f77cdb72d381dc5ecf4b335c4324f0e6c777113546b91edf290767c6daa5d0e7641b4849cad42230688a799e1a4359f4dfb SHA512 e5ca8b7ab1542fda0c84d92bba527911846cdd95cbe86d4aa0075abacffc369485ad7187bc7e0ee2edcd69ccbc4ef2abcd0de75be497c0cdc3d6177563067875
+DIST shuffile-0.0.4.tar.gz 28847 BLAKE2B 7e36c8d96457eb44f59f9017d69ad53265d88c47b33d37b8b2ab6ea2365eb2bd0eb78a25a2496754d839ae5507615356e2cb5508879b82c99e2ef91ef9f7af0e SHA512 2c90e1aa852413f15fabc78c0553344b1b8975972ff84239d872738f102d7784f16422ccc2807189307db0feb0abb28b4db02c1666957a94a92e6be329f4a277
diff --git a/sys-cluster/shuffile/files/no-static-0.0.4.patch b/sys-cluster/shuffile/files/no-static-0.0.4.patch
new file mode 100644
index 0000000000..33edb7d016
--- /dev/null
+++ b/sys-cluster/shuffile/files/no-static-0.0.4.patch
@@ -0,0 +1,16 @@
+--- a/src/CMakeLists.txt	2021-04-13 01:07:33.798593182 +0200
++++ b/src/CMakeLists.txt	2021-04-13 01:08:02.110951981 +0200
+@@ -24,13 +24,3 @@
+ TARGET_LINK_LIBRARIES(shuffile ${SHUFFILE_EXTERNAL_LIBS})
+ SET_TARGET_PROPERTIES(shuffile PROPERTIES OUTPUT_NAME shuffile CLEAN_DIRECT_OUTPUT 1)
+ INSTALL(TARGETS shuffile DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-
+-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.0.4.ebuild b/sys-cluster/shuffile/shuffile-0.0.4.ebuild
new file mode 100644
index 0000000000..f546a03865
--- /dev/null
+++ b/sys-cluster/shuffile/shuffile-0.0.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+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"
+PATCHES=( "${FILESDIR}/no-static-${PV}.patch" )
+RDEPEND="
+	>=sys-cluster/KVTree-1.0.2[mpi]
+	sys-libs/zlib
+	virtual/mpi
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/cmake-2.8
+"