diff --git a/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r1.ebuild b/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r2.ebuild
similarity index 93%
rename from sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r1.ebuild
rename to sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r2.ebuild
index cf67239187..7da3d3563f 100644
--- a/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r1.ebuild
+++ b/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r2.ebuild
@@ -17,8 +17,8 @@ SRC_URI="https://ftp.tools.bsc.es/clusteringsuite/clusteringsuite-${PV}-src.tar.
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="doc mpi"
-#TODO: muster treedbscan
+IUSE="doc mpi muster"
+#TODO: treedbscan
 
 PATCHES=( "${FILESDIR}/${P}-unbundle-libANN.patch" )
 
@@ -27,6 +27,7 @@ RDEPEND="
 	sci-libs/ann
 	sys-cluster/libbsctools
 	mpi? ( virtual/mpi )
+	muster? ( sys-cluster/muster )
 "
 #	treedbscan? (
 #		dev-libs/boost[threads]:=
@@ -64,11 +65,11 @@ src_configure() {
 	else
 		myconf+=( "--without-mpi" )
 	fi
-#	if use muster; then
-#		myconf+=( "--with-muster=${EPREFIX}/usr" )
-#	else
+	if use muster; then
+		myconf+=( "--with-muster=${EPREFIX}/usr" )
+	else
 		myconf+=( "--without-muster" )
-#	fi
+	fi
 #	if use treedbscan; then
 #		myconf+=( "--enable-treedbscan" )
 #		myconf+=( "--with-cgal=${EPREFIX}/usr" )
diff --git a/sys-cluster/clusteringsuite/metadata.xml b/sys-cluster/clusteringsuite/metadata.xml
index f97124ffdd..d0ad8930d5 100644
--- a/sys-cluster/clusteringsuite/metadata.xml
+++ b/sys-cluster/clusteringsuite/metadata.xml
@@ -6,9 +6,8 @@
 		<name>Alessandro Barbieri</name>
 	</maintainer>
 	<use>
-		<!--<flag name="maintainer-mode">enable make rules and dependencies not useful (and sometimes confusing) to the casual installer</flag>-->
 		<flag name="mpi">enable mpi for distributed version</flag>
-		<!--<flag name="muster">enable support for Muster algorithms</flag>-->
+		<flag name="muster">enable support for <pkg>sys-cluster/muster</pkg> algorithms</flag>
 		<flag name="old-pcfparser">enable compilation with old pcfparser</flag>
 		<!--<flag name="treedbscan">enable compilation of TreeDBSCAN support for <pkg>sys-cluster/extrae</pkg></flag>-->
 	</use>