diff --git a/dev-python/mando/Manifest b/dev-python/mando/Manifest
index 5fc7ed1..ffab783 100644
--- a/dev-python/mando/Manifest
+++ b/dev-python/mando/Manifest
@@ -2,21 +2,22 @@
 Hash: SHA256
 
 DIST mando-0.3.2.tar.gz 22393 BLAKE2B bf6a7df4a6e2e8270d0b8fa278cde7d520bf5c9d490dec748927d8f7c024381094f946e5feb4b5334b0d7255df002aeb1b42b8545b7514194425e37f739d2da9 SHA512 57f5041ad175c4eca4c158d9d917dcb1f9c25978c60aa0e76322d0395b0edbc3fb7b062da7b9af871a97bbd46cfe7f81e634287f813baf15ef134be53150bd11
+DIST mando-0.6.4.tar.gz 36560 BLAKE2B 9878746485d4b896c3e32512b77ac02739940a1398eee12056fd6719cc3c99f8c526c8e573d2556b6a9d0d8d26e20fb45c97119e626b1d44f0a5b5f4655adba1 SHA512 457fa0db4e8e5dbfac6146d254181213814ef1975c919b4573007face27749ec3a50eda850558ebdc0fdff94a5e9819fd825b10cb3023078b2b426c2825fdbf0
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCAB9FiEEcg3s4uUa4XE72XWQvF3CmYqtKyEFAl5N8RVfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEcg3s4uUa4XE72XWQvF3CmYqtKyEFAl5N8UJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDcy
 MERFQ0UyRTUxQUUxNzEzQkQ5NzU5MEJDNURDMjk5OEFBRDJCMjEACgkQvF3CmYqt
-KyHrdg//VlvS7elb3i0htu4rqHt2LXR3jgwr6O/AK/Z3quqpxePcvwbBj/+PdfnG
-uVrGitlaPy+EWN1DQl4Rh4MyhcNg/D7gBeZQqJfW1NpO5HTZ6kzu+Q/3FiyBl7DT
-UoWvvzn+LqRggnnQBpzuEo3F0M/rgboK8oRBW3lZ2TdtZDuWmL/Zpmtltb5H1YZx
-Vgw5lAiINnnVGEhbsiIYXqJV8hDPG8RR1/aGvEJw0NFMw+7NLPW8H2iSsoxf+zqE
-o85fAmZ3V73PvedHzmU1hnCJSeyVIkB3Bvk6s7Slmfu2O5lILxK+vBhD5p/KR9tn
-6n5x2oYDPH0S+3q3OmcLmrW6tbQ5fLnQhqiZrWeBCDNu9cwjMGBqYGIcDU8RUi9Z
-CXB4NBhGtIBuL5mAoUwGKxbIP/X9lugP8J89JJkMn3R1xmD+QxpdQu78Oza9qhRs
-I0q1yqyrzwfp7pUv+fxMFPkjQFZ0oW0i6MpWQ03dnOSIxUvtAfolnw2kSezCvDN3
-55+RDYbZXWXvrvZEibgq5aXzU3H0udSPTvXcIA3dNAUd7w3hOcICMQ1pqR/A9Pri
-dZSHPvmJOVSVLBeF8ehWgEwU4cM5+LJhlvyxUoWb8GrGHVDBBwTbu0UqTR6lWbDX
-0HtsuygUkVZoEYvxCdIiyPfrDyA3WiZWknvihLjRELk+q9UWtwA=
-=BVQn
+KyFg2xAAlozNcz6dGvql/mHo8ZmT7YsXsFz3Gst/8sGD6//oi+i4hMlYtuszoRFn
+7BEneRDe+WyZwkDxJ4Bs2BuiQRFyakj+78YfuZj8XyUA3gDwrTz7TXATGZ8YxR92
+3JxBHH+ISY92RDThlJr2SLDHsm8A1QT4xLycIhnK1c+2KfmmfS7n749MB8ceJS2J
+iKdVRwzvrbUSchSrlLUwJwueYGYoFARbdPhYakghxIZEskxy2BZnrsenVANcVAHW
+DTjupMYdxfEZ/ACbeh1D6PbckHHpLHRugMd2h1ONluMnMfce/pXOij0yPfEKgxbI
+AxG3ETgSStwPBIuTLWhg3/Jfm/yYYr0NKnDnIaDp1xhWzFeZ6kO0L+SIgei0prkV
+sNkAhw1VvptORNIaVjxgqD+HYN0CQar80m7FX9ewgi61y/4Q0brmhAllgrc7giBY
+l7giay0/e+i6WydEcjHBXfkmoshigxVVoRSwnyWw74N/JQg8mSLm3zGXc5pXlpHn
+D1Q0hKChtwYrOdQYk7f2uc+tjDimCBhUmgnerXPEWn71FmcVl59NhANJxXv0AHEM
+TZrLK1VTwTidC8XEyA9/FnV+BgAM9eRw9/CAccK++m90FxMDPUjgQ1Sk7DCH5IbM
+sUZEUQaX91hhs4/+HYHyitbi7LyBe7lw2Qy5JjM+9Qgmpqzwnaw=
+=btO2
 -----END PGP SIGNATURE-----
diff --git a/dev-python/mando/mando-0.6.4.ebuild b/dev-python/mando/mando-0.6.4.ebuild
new file mode 100644
index 0000000..fe0dc36
--- /dev/null
+++ b/dev-python/mando/mando-0.6.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Create Python CLI apps with little to no effort at all!"
+HOMEPAGE="https://mando.readthedocs.org/ https://github.com/rubik/mando"
+SRC_URI="https://github.com/rubik/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+# https://github.com/rik0/ParamUnittest/issues/8
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/tox[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND=""
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	dev-python/pytest
+	"${PYTHON}" mando/tests/run.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}