diff --git a/net-firewall/hblock/hblock-2.1.5.ebuild b/net-firewall/hblock/hblock-2.1.5.ebuild
index 4c7cb25..43b5fce 100644
--- a/net-firewall/hblock/hblock-2.1.5.ebuild
+++ b/net-firewall/hblock/hblock-2.1.5.ebuild
@@ -22,23 +22,20 @@ LICENSE="MIT"
 SLOT="0"
 IUSE=""
 
-COMMON_DEPEND="
+DEPEND="
 	sys-apps/baselayout
 "
-DEPEND="
-	${COMMON_DEPEND}
+BDEPEND="
+	${DEPEND}
 	sys-apps/coreutils
 "
 RDEPEND="
-	${COMMON_DEPEND}
+	${DEPEND}
 "
 
-DOCS=(
-	README.md
-)
-
 src_prepare() {
 	default
+
 	# Upstream provides shasums in the repo - let's use them
 	cd "${S}" || die
 	sha256sum -c "${S}"/SHA256SUMS || die "Shasum check failed"
@@ -51,9 +48,10 @@ src_compile() {
 }
 
 src_install() {
-	exeinto "/usr/bin"
-	doexe "${PN}"
+	einstalldocs
+
+	dobin "${PN}"
+
 	systemd_dounit "${S}"/resources/systemd/hblock.service
 	systemd_dounit "${S}"/resources/systemd/hblock.timer
-	einstalldocs
 }
diff --git a/net-firewall/hblock/hblock-2.1.7.ebuild b/net-firewall/hblock/hblock-2.1.7.ebuild
index 4c7cb25..43b5fce 100644
--- a/net-firewall/hblock/hblock-2.1.7.ebuild
+++ b/net-firewall/hblock/hblock-2.1.7.ebuild
@@ -22,23 +22,20 @@ LICENSE="MIT"
 SLOT="0"
 IUSE=""
 
-COMMON_DEPEND="
+DEPEND="
 	sys-apps/baselayout
 "
-DEPEND="
-	${COMMON_DEPEND}
+BDEPEND="
+	${DEPEND}
 	sys-apps/coreutils
 "
 RDEPEND="
-	${COMMON_DEPEND}
+	${DEPEND}
 "
 
-DOCS=(
-	README.md
-)
-
 src_prepare() {
 	default
+
 	# Upstream provides shasums in the repo - let's use them
 	cd "${S}" || die
 	sha256sum -c "${S}"/SHA256SUMS || die "Shasum check failed"
@@ -51,9 +48,10 @@ src_compile() {
 }
 
 src_install() {
-	exeinto "/usr/bin"
-	doexe "${PN}"
+	einstalldocs
+
+	dobin "${PN}"
+
 	systemd_dounit "${S}"/resources/systemd/hblock.service
 	systemd_dounit "${S}"/resources/systemd/hblock.timer
-	einstalldocs
 }
diff --git a/net-firewall/hblock/hblock-9999.ebuild b/net-firewall/hblock/hblock-9999.ebuild
index 4c7cb25..43b5fce 100644
--- a/net-firewall/hblock/hblock-9999.ebuild
+++ b/net-firewall/hblock/hblock-9999.ebuild
@@ -22,23 +22,20 @@ LICENSE="MIT"
 SLOT="0"
 IUSE=""
 
-COMMON_DEPEND="
+DEPEND="
 	sys-apps/baselayout
 "
-DEPEND="
-	${COMMON_DEPEND}
+BDEPEND="
+	${DEPEND}
 	sys-apps/coreutils
 "
 RDEPEND="
-	${COMMON_DEPEND}
+	${DEPEND}
 "
 
-DOCS=(
-	README.md
-)
-
 src_prepare() {
 	default
+
 	# Upstream provides shasums in the repo - let's use them
 	cd "${S}" || die
 	sha256sum -c "${S}"/SHA256SUMS || die "Shasum check failed"
@@ -51,9 +48,10 @@ src_compile() {
 }
 
 src_install() {
-	exeinto "/usr/bin"
-	doexe "${PN}"
+	einstalldocs
+
+	dobin "${PN}"
+
 	systemd_dounit "${S}"/resources/systemd/hblock.service
 	systemd_dounit "${S}"/resources/systemd/hblock.timer
-	einstalldocs
 }