diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 29c747b1d6dae..d9d7589314457 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -72,10 +72,6 @@ net-analyzer/scapy visual
 # net-dns/hesiod will be removed (#606652)
 sys-freebsd/freebsd-lib hesiod
 
-# Pacho Ramos <pacho@gentoo.org> (17 Mar 2018)
-# sys-fabric/mstflint will be removed (#594908)
-sys-fabric/ofed mstflint
-
 # Lars Wendler <polynomial-c@gentoo.org> (14 Mar 2018)
 # Broken on all 32bit arches. Globally masked because of sys-apps/dmapi having
 # no active upstream anymore.
diff --git a/sys-fabric/ofed/metadata.xml b/sys-fabric/ofed/metadata.xml
index 09006c9299cdb..5b631af649652 100644
--- a/sys-fabric/ofed/metadata.xml
+++ b/sys-fabric/ofed/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="dapl">Add support for DAPL abstraction layer</flag>
 		<flag name="diags">Add dignostic tools for infiniband</flag>
 		<flag name="ibacm">Add support for userspace pre-connection services</flag>
-		<flag name="mstflint">Tools to burn Mellanox firmware</flag>
 		<flag name="opensm">Add OpenSM - Subnet manager for infiniband</flag>
 		<flag name="perftest">Add perftest utils</flag>
 		<flag name="qperf">Add rdma tests</flag>
diff --git a/sys-fabric/ofed/ofed-3.12_rc1.ebuild b/sys-fabric/ofed/ofed-3.12_rc1.ebuild
index d015f9d282b74..b0494089fe08f 100644
--- a/sys-fabric/ofed/ofed-3.12_rc1.ebuild
+++ b/sys-fabric/ofed/ofed-3.12_rc1.ebuild
@@ -24,7 +24,7 @@ inherit openib udev toolchain-funcs
 
 DESCRIPTION="OpenIB system files"
 KEYWORDS="amd64 ~x86 ~amd64-linux"
-IUSE="dapl +diags ibacm mstflint +opensm perftest qperf rds srp ${IUSE_OFED_DRIVERS}"
+IUSE="dapl +diags ibacm +opensm perftest qperf rds srp ${IUSE_OFED_DRIVERS}"
 
 RDEPEND="!sys-fabric/openib
 		!sys-fabric/openib-files
@@ -35,7 +35,6 @@ RDEPEND="!sys-fabric/openib
 		dapl? ( sys-fabric/dapl:${SLOT} )
 		diags? ( sys-fabric/infiniband-diags:${SLOT} )
 		ibacm? ( sys-fabric/ibacm:${SLOT} )
-		mstflint? ( sys-fabric/mstflint:${SLOT} )
 		opensm? ( sys-fabric/opensm:${SLOT} )
 		perftest? ( sys-fabric/perftest:${SLOT} )
 		qperf? ( sys-fabric/qperf:${SLOT} )