diff --git a/app-misc/cheat/cheat-3.9.0.ebuild b/app-misc/cheat/cheat-3.9.0-r1.ebuild
similarity index 96%
rename from app-misc/cheat/cheat-3.9.0.ebuild
rename to app-misc/cheat/cheat-3.9.0-r1.ebuild
index efd0b6817e..5644e85494 100644
--- a/app-misc/cheat/cheat-3.9.0.ebuild
+++ b/app-misc/cheat/cheat-3.9.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
 inherit go-module
 
@@ -91,12 +91,13 @@ LICENSE="MIT Apache-2.0 BSD BSD-2"
 SLOT="0"
 KEYWORDS="~amd64"
 
-IUSE="man zsh-completion"
+IUSE="zsh-completion"
 
-BDEPEND=">=dev-lang/go-1.13
-	man? ( app-text/pandoc )
+BDEPEND="
+	app-text/pandoc
+	>=dev-lang/go-1.13
 "
-RDEPEND="zsh-completion? ( app-shells/zsh-completions )"
+RDEPEND="zsh-completion? ( !app-shells/zsh-completions )"
 
 src_install() {
 	dobin "dist/${PN}"
@@ -104,5 +105,5 @@ src_install() {
 		insinto /usr/share/zsh/site-functions
 		newins scripts/cheat.zsh _cheat
 	fi
-	use man && doman doc/cheat.1
+	doman doc/cheat.1
 }
diff --git a/app-misc/cheat/metadata.xml b/app-misc/cheat/metadata.xml
index d1a353ea2e..ee804793de 100644
--- a/app-misc/cheat/metadata.xml
+++ b/app-misc/cheat/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mathieu.tortuyaux@gmail.com</email>
 		<name>Mathieu Tortuyaux</name>
 	</maintainer>
-	<use>
-		<flag name="man">build and install man pages</flag>
-	</use>
 	<longdescription lang="en">
 cheat allows you to create and view interactive cheatsheets on the command-line.
 It was designed to help remind *nix system administrators of options for commands that they use frequently, but not frequently enough to remember.