diff --git a/sys-libs/libblockdev/libblockdev-2.14.ebuild b/sys-libs/libblockdev/libblockdev-2.14-r1.ebuild
similarity index 93%
rename from sys-libs/libblockdev/libblockdev-2.14.ebuild
rename to sys-libs/libblockdev/libblockdev-2.14-r1.ebuild
index 2e025fb3e1e70..97d5e9685f530 100644
--- a/sys-libs/libblockdev/libblockdev-2.14.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.14-r1.ebuild
@@ -15,14 +15,14 @@ SRC_URI="https://github.com/rhinstaller/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}
 LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="bcache +crypt dmraid doc lvm kbd test"
+IUSE="bcache +cryptsetup dmraid doc lvm kbd test"
 
 CDEPEND="
 	>=dev-libs/glib-2.42.2
 	dev-libs/libbytesize
 	>=sys-apps/util-linux-2.27
 	>=sys-block/parted-3.1
-	crypt? (
+	cryptsetup? (
 		>=dev-libs/nss-3.18.0
 		dev-libs/volume_key
 		>=sys-fs/cryptsetup-1.6.7
@@ -71,7 +71,7 @@ src_configure() {
 		--without-mpath
 		$(use_enable test tests)
 		$(use_with bcache)
-		$(use_with crypt crypto)
+		$(use_with cryptsetup crypto)
 		$(use_with dmraid dm)
 		$(use_with doc gtk-doc)
 		$(use_with lvm lvm)
diff --git a/sys-libs/libblockdev/libblockdev-2.15.ebuild b/sys-libs/libblockdev/libblockdev-2.15-r1.ebuild
similarity index 93%
rename from sys-libs/libblockdev/libblockdev-2.15.ebuild
rename to sys-libs/libblockdev/libblockdev-2.15-r1.ebuild
index 53c3efbcb20ac..e4528c4944966 100644
--- a/sys-libs/libblockdev/libblockdev-2.15.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.15-r1.ebuild
@@ -15,14 +15,14 @@ SRC_URI="https://github.com/rhinstaller/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}
 LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="bcache +crypt dmraid doc lvm kbd test"
+IUSE="bcache +cryptsetup dmraid doc lvm kbd test"
 
 CDEPEND="
 	>=dev-libs/glib-2.42.2
 	dev-libs/libbytesize
 	>=sys-apps/util-linux-2.27
 	>=sys-block/parted-3.1
-	crypt? (
+	cryptsetup? (
 		>=dev-libs/nss-3.18.0
 		dev-libs/volume_key
 		>=sys-fs/cryptsetup-1.6.7
@@ -71,7 +71,7 @@ src_configure() {
 		--without-mpath
 		$(use_enable test tests)
 		$(use_with bcache)
-		$(use_with crypt crypto)
+		$(use_with cryptsetup crypto)
 		$(use_with dmraid dm)
 		$(use_with doc gtk-doc)
 		$(use_with lvm lvm)
diff --git a/sys-libs/libblockdev/metadata.xml b/sys-libs/libblockdev/metadata.xml
index 6f4957ace55d7..7fd674aa5a141 100644
--- a/sys-libs/libblockdev/metadata.xml
+++ b/sys-libs/libblockdev/metadata.xml
@@ -7,6 +7,7 @@
   </maintainer>
   <use>
     <flag name="bcache">Enable block device cache support.</flag>
+    <flag name="cryptsetup">Enable <pkg>sys-fs/cryptsetup</pkg> support</flag>
     <flag name="dmraid">Support for dmraid devices, also known as ATA-RAID, or Fake RAID.</flag>
     <flag name="lvm">Enable support for Logical Volume Management via <pkg>sys-fs/lvm2</pkg>.</flag>
     <flag name="kbd">Enable kernel block device support.</flag>