diff --git a/sys-cluster/nanos6/metadata.xml b/sys-cluster/nanos6/metadata.xml
index 8fbd76dea2..0245bbc23a 100644
--- a/sys-cluster/nanos6/metadata.xml
+++ b/sys-cluster/nanos6/metadata.xml
@@ -19,7 +19,7 @@
 		<flag name="memkind">Add support for <pkg>dev-libs/memkind</pkg> in memory allocator</flag>
 		<flag name="mercurium">Enable <pkg>sys-cluster/mcxx</pkg> support</flag>
 		<flag name="papi">enable <pkg>dev-libs/papi</pkg> support</flag>
-		<!--<flag name="pqos"> to generate real-time statistics of hardware counters</flag>-->
+		<flag name="pqos"> to generate real-time statistics of hardware counters</flag>
 		<flag name="unwind">to generate sample-based profiling</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-cluster/nanos6/nanos6-2.6-r1.ebuild b/sys-cluster/nanos6/nanos6-2.6-r2.ebuild
similarity index 95%
rename from sys-cluster/nanos6/nanos6-2.6-r1.ebuild
rename to sys-cluster/nanos6/nanos6-2.6-r2.ebuild
index c5fef5c02a..c3ba5a6720 100644
--- a/sys-cluster/nanos6/nanos6-2.6-r1.ebuild
+++ b/sys-cluster/nanos6/nanos6-2.6-r2.ebuild
@@ -13,9 +13,9 @@ S="${WORKDIR}/${PN}-version-${PV}"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="debug dlb execution-workflow extrae memkind mercurium papi test unwind"
+IUSE="debug dlb execution-workflow extrae memkind mercurium papi pqos test unwind"
 #jemalloc require custom stuff
-#TODO: cuda pqos babeltrace2
+#TODO: cuda babeltrace2
 #TODO: llvm-libunwind
 
 RDEPEND="
@@ -29,6 +29,7 @@ RDEPEND="
 	memkind? ( dev-libs/memkind )
 	mercurium? ( sys-cluster/mcxx[ompss2] )
 	papi? ( dev-libs/papi )
+	pqos? ( sys-apps/intel-cmt-cat )
 	unwind? ( sys-libs/libunwind )
 "
 #	jemalloc? ( dev-libs/jemalloc )
@@ -64,6 +65,7 @@ src_configure() {
 	)
 	use dlb && myconf+=( "--with-dlb=${EPREFIX}/usr" )
 	use memkind && myconf+=( "--with-memkind=${EPREFIX}/usr" )
+	use pqos && myconf+=( "--with-pqos=${EPREFIX}/usr" )
 
 #	if use babeltrace; then
 #		myconf+=( "--with-babeltrace2=${EPREFIX}/usr" )
@@ -98,7 +100,6 @@ src_configure() {
 
 	econf "${myconf[@]}"
 }
-#		--without-pqos
 #		--without-cuda
 
 src_install() {