diff --git a/sys-cluster/nanos6/Manifest b/sys-cluster/nanos6/Manifest
index 783a17df8b..6ef8d525e2 100644
--- a/sys-cluster/nanos6/Manifest
+++ b/sys-cluster/nanos6/Manifest
@@ -1 +1 @@
-DIST nanos6-2.5.1.tar.gz 744260 BLAKE2B 6b294391ebb18806da76b4bc73aaf6f7082ab4a61693ab300e130f04942bf50c1da884e5271765465bedab863cb1ce545a43ac09727152c0a52d69852e60e373 SHA512 c7da862aa41fb0be1a992f4fde7306a02c4159c05a89055f0144bf6a815c10ff5f7e7ee11b4afaa4c468afdd538a99b3b5971a896221b20928805b45d35e0335
+DIST nanos6-2.6.tar.gz 739246 BLAKE2B 4a5cb079b09fe2eaa40ee4064307dfc8facf1515801c6ddfe34b301b6c48df167a3603435e3998f28511738709e53d7245421bcdda69829268b7f86748d3de87 SHA512 af6e95f2d523a22b033f380efd4c36d44d85708b7852f692dc700c89dcca12405882d09437d672f06ffd0dbe429bc1e2f52f86e148882d254f7a3d8f8221b222
diff --git a/sys-cluster/nanos6/metadata.xml b/sys-cluster/nanos6/metadata.xml
index dd376439d3..c937f87ccd 100644
--- a/sys-cluster/nanos6/metadata.xml
+++ b/sys-cluster/nanos6/metadata.xml
@@ -10,7 +10,6 @@
 		<remote-id type="github">bsc-pm/nanos6</remote-id>
 	</upstream>
 	<use>
-		<!--<flag name="chrono-arch">use an architecture-dependent chrono for timing instead of the default one</flag>-->
 		<flag name="cluster">Enable OmpSs@Cluster support. This requires an MPI version that supports MPI_THREAD_MULTIPLE to be present in your environment</flag>
 		<!--<flag name="cuda">enable CUDA</flag>-->
 		<flag name="debug">enable extra assertions and checks in debug - may cause significant slowdown</flag>
@@ -19,7 +18,7 @@
 		<flag name="extrae">to generate execution traces for offline performance analysis with paraver</flag>
 		<!--<flag name="jemalloc">use jemalloc as the default memory allocator, providing better performance than the default glibc implementation</flag>-->
 		<!--<flag name="k1om">specify the installation prefix of the k1om GNU compilers</flag>-->
-		<!--<flag name="memkind">specify the installation prefix of memkind</flag>-->
+		<flag name="memkind">Add support for <pkg>dev-libs/memkind</pkg> in memory allocator</flag>
 		<!--<flag name="mercurium">specify the installation prefix of the Nanos6 Mercurium compiler</flag>-->
 		<flag name="papi">enable <pkg>dev-libs/papi</pkg> support</flag>
 		<!--<flag name="pqos"> to generate real-time statistics of hardware counters</flag>-->
diff --git a/sys-cluster/nanos6/nanos6-2.5.1-r2.ebuild b/sys-cluster/nanos6/nanos6-2.6.ebuild
similarity index 84%
rename from sys-cluster/nanos6/nanos6-2.5.1-r2.ebuild
rename to sys-cluster/nanos6/nanos6-2.6.ebuild
index e7624ed399..c9fec03aad 100644
--- a/sys-cluster/nanos6/nanos6-2.5.1-r2.ebuild
+++ b/sys-cluster/nanos6/nanos6-2.6.ebuild
@@ -12,10 +12,10 @@ S="${WORKDIR}/${PN}-version-${PV}"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="cluster debug dlb execution-workflow extrae papi unwind"
+IUSE="cluster debug dlb execution-workflow extrae memkind papi unwind"
 #chrono-arch build fail
 #jemalloc require custom stuff
-#TODO: cuda pqos mercurium memkind k1om
+#TODO: cuda pqos mercurium k1om babeltrace2
 #TODO: llvm-libunwind
 
 RDEPEND="
@@ -27,6 +27,7 @@ RDEPEND="
 	cluster? ( virtual/mpi )
 	dlb? ( sys-cluster/dlb )
 	extrae? ( sys-cluster/extrae[nanos] )
+	memkind? ( dev-libs/memkind )
 	papi? ( dev-libs/papi )
 	unwind? ( sys-libs/libunwind )
 "
@@ -40,7 +41,6 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
-		--disable-chrono-arch
 		--disable-embed-code-changes
 		--disable-openacc
 		--disable-static
@@ -63,11 +63,21 @@ src_configure() {
 	)
 	use dlb && myconf+=( "--with-dlb=${EPREFIX}/usr" )
 
+#	if use babeltrace; then
+#		myconf+=( "--with-babeltrace2=${EPREFIX}/usr" )
+#	else
+#		myconf+=( "--without-babeltrace2" )
+#	fi
 	if use extrae; then
 		myconf+=( "--with-extrae=${EPREFIX}/usr" )
 	else
 		myconf+=( "--without-extrae" )
 	fi
+	if use memkind; then
+		myconf+=( "--with-memkind=${EPREFIX}/usr" )
+	else
+		myconf+=( "--without-memkind" )
+	fi
 	if use papi; then
 		myconf+=( "--with-papi=${EPREFIX}/usr" )
 	else
@@ -82,9 +92,7 @@ src_configure() {
 	econf "${myconf[@]}"
 }
 #		--without-pqos
-#		--without-jemalloc
 #		--without-cuda
-#		--without-memkind
 
 src_install() {
 	default