diff --git a/sys-fs/ext4-crypt/Manifest b/sys-fs/ext4-crypt/Manifest
new file mode 100644
index 000000000..aa972ea1f
--- /dev/null
+++ b/sys-fs/ext4-crypt/Manifest
@@ -0,0 +1 @@
+DIST ext4-crypt-20170216.tar.gz 8497 BLAKE2B c7f1fc88f45286da2130ade1a7f3e57645bd08f6b95c46ccef96b23d81dece77f84c5428785753c90f7ceff34e1fa44c1d0db63b6385864fc9acc628816916ee SHA512 a6c706ff752f422490d0bf95bd37a234d904ee4ebdf9f4e2176409068797d93fa554113060c3477010447bee6bb7d782e5123df4109d9cadac9c82c955567eb3
diff --git a/sys-fs/ext4-crypt/ext4-crypt-20170216.ebuild b/sys-fs/ext4-crypt/ext4-crypt-20170216.ebuild
new file mode 120000
index 000000000..c24c5b0ac
--- /dev/null
+++ b/sys-fs/ext4-crypt/ext4-crypt-20170216.ebuild
@@ -0,0 +1 @@
+ext4-crypt-99999999.ebuild
\ No newline at end of file
diff --git a/sys-fs/ext4-crypt/ext4-crypt-9999.ebuild b/sys-fs/ext4-crypt/ext4-crypt-9999.ebuild
deleted file mode 100644
index 44f2d49cd..000000000
--- a/sys-fs/ext4-crypt/ext4-crypt-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils git-r3
-
-DESCRIPTION="This is a userspace tool to manage encrypted ext4 directories since Linux kernel 4.1 introduced native encryption"
-HOMEPAGE="https://github.com/gdelugre/ext4-crypt"
-SRC_URI=""
-
-EGIT_REPO_URI="https://github.com/gdelugre/ext4-crypt"
-EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-9999"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		dev-libs/libsodium
-		sys-apps/keyutils
-		"
diff --git a/sys-fs/ext4-crypt/ext4-crypt-99999999.ebuild b/sys-fs/ext4-crypt/ext4-crypt-99999999.ebuild
new file mode 100644
index 000000000..72099e61a
--- /dev/null
+++ b/sys-fs/ext4-crypt/ext4-crypt-99999999.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils linux-info
+
+DESCRIPTION="A userspace tool to create ext4 encrypted directories"
+HOMEPAGE="https://github.com/gdelugre/ext4-crypt"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gdelugre/ext4-crypt"
+else
+	# snapshot: 20170216
+	HASH_COMMIT="faa14f0176af814de91d1fadd208eb2795ddb19c"
+
+	SRC_URI="https://github.com/gdelugre/ext4-crypt/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/${PN}-${HASH_COMMIT}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+DEPEND="
+	dev-libs/libsodium:0=
+	sys-apps/keyutils:="
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	local CONFIG_CHECK="~EXT4_ENCRYPTION ~EXT4_FS_ENCRYPTION ~EXT4_FS_SECURITY"
+	check_extra_config
+}
+
+src_prepare() {
+	# FIX: QA Notice: Pre-stripped files found
+	sed -e "s/set(CMAKE_EXE_LINKER_FLAGS \"-s\")//" \
+		-i CMakeLists.txt || die "sed failed!"
+
+	cmake-utils_src_prepare
+}
+
+pkg_postinst() {
+	ewarn "\nYou also need to do before use it:"
+	ewarn "    tune2fs -O encrypt <blockdevice>\n"
+}
diff --git a/sys-fs/ext4-crypt/metadata.xml b/sys-fs/ext4-crypt/metadata.xml
new file mode 100644
index 000000000..c4511c144
--- /dev/null
+++ b/sys-fs/ext4-crypt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>email@linxon.ru</email>
+    <name>Yury Martynov</name>
+  </maintainer>
+</pkgmetadata>