diff --git a/app-crypt/autofirma/autofirma-1.8.3.ebuild b/app-crypt/autofirma/autofirma-1.8.3.ebuild
index f9d8c773f3..89b6493688 100644
--- a/app-crypt/autofirma/autofirma-1.8.3.ebuild
+++ b/app-crypt/autofirma/autofirma-1.8.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 
 # Upstream blocks wget with no User Agent. It can be addressed globally (see https://wiki.gentoo.org/wiki/FETCHCOMMAND).
 # If Gentoo's default configuration is in place, pkg_pretend() and pkg_nofetch() provide fallback options.
-SRC_URI="https://estaticos.redsara.es/comunes/autofirma/$(ver_rs 1- /)/AutoFirma_Linux_Fedora.zip -> ${P}.zip"
+SRC_URI="https://estaticos.redsara.es/comunes/autofirma/$(ver_rs 1- /)/AutoFirma_Linux_Fedora.zip -> ${PF}.zip"
 
 S=${WORKDIR}
 
@@ -22,18 +22,23 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 RDEPEND="virtual/jre:1.8"
-BDEPEND="app-arch/unzip"
+BDEPEND="
+	app-arch/unzip
+	net-misc/wget
+"
 
 pkg_pretend() {
 	# Upstream blocks vanilla wget, so we set up a browser User-Agent as a fallback.
-	URI="https://estaticos.redsara.es/comunes/autofirma/$(ver_rs 1- /)/AutoFirma_Linux_Fedora.zip"
-	/usr/sbin/wget --user-agent="Mozilla/5.0 (X11; Fedora; Linux x86_64; rv:52.0) Gecko/20100101 Firefox/52.0" "${URI}" -O "${PORTAGE_ACTUAL_DISTDIR}"/"${P}".zip
+	local URI="https://estaticos.redsara.es/comunes/autofirma/$(ver_rs 1- /)/AutoFirma_Linux_Fedora.zip"
+	local USER_AGENT="Mozilla/5.0 (X11; Fedora; Linux x86_64; rv:52.0) Gecko/20100101 Firefox/52.0"
+	local DISTFILE="${PORTAGE_ACTUAL_DISTDIR}/${PF}.zip"
+	[ -f "${DISTFILE}" ] || /usr/sbin/wget --user-agent="${USER_AGENT}" "${URI}" -O "${DISTFILE}"
 }
 
 pkg_nofetch() {
 	einfo "Please download:"
 	einfo " https://estaticos.redsara.es/comunes/autofirma/$(ver_rs 1- /)/AutoFirma_Linux_Fedora.zip"
-	einfo "and move it to your distfiles directory as autofirma-${PV}.zip."
+	einfo "and move it to ${PORTAGE_ACTUAL_DISTDIR}/${PF}.zip."
 }
 
 src_unpack() {