diff --git a/app-crypt/autofirma/Manifest b/app-crypt/autofirma/Manifest
index 2db192482a..b8cbdd610e 100644
--- a/app-crypt/autofirma/Manifest
+++ b/app-crypt/autofirma/Manifest
@@ -1 +1 @@
-DIST autofirma-1.6.5.zip 155509984 BLAKE2B cc5def6ff029d3e1799485a25035ae95e6da03c11bb7186eab01adf55e4457de00ffcff6cb79129c4ad98e5024b79625ace70c41507825f706dff992f8c3408c SHA512 927b67a93c111f1d040e38d26122f7a9d7b8d41599da776fa2895fd97409696d4a97663f4b5b4fea32e6d613e21f104cabd2c860f719954cf954e081dc3a727d
+DIST autofirma-1.7.1.zip 152716878 BLAKE2B d985bfa71ce1b4318a50fc4c93b1a85a388de445f8e4a18c7e616988955b94ac79e73a7fb4e3c202cf303255cb497679eaeb7b2546c08f3e3974d440e793ce12 SHA512 52098e74537dea9b72be8f4b2b05c2c57ed79f0c496ff5a4c4e1ddfe88fab528b2e9a237d9c8f0151bc499687a6fc2966227d6b3f2cae2943d7c772b9286755b
diff --git a/app-crypt/autofirma/autofirma-1.6.5-r1.ebuild b/app-crypt/autofirma/autofirma-1.7.1.ebuild
similarity index 66%
rename from app-crypt/autofirma/autofirma-1.6.5-r1.ebuild
rename to app-crypt/autofirma/autofirma-1.7.1.ebuild
index 0a6f2d76df..c0886964f9 100644
--- a/app-crypt/autofirma/autofirma-1.6.5-r1.ebuild
+++ b/app-crypt/autofirma/autofirma-1.7.1.ebuild
@@ -10,11 +10,9 @@ HOMEPAGE="
 	https://administracionelectronica.gob.es/ctt/clienteafirma
 	https://github.com/ctt-gob-es/clienteafirma
 "
-#TODO: use ver_split instead of hardcoded 1/6/5
-SRC_URI="https://estaticos.redsara.es/comunes/autofirma/1/6/5/AutoFirma_Linux.zip -> ${P}.zip"
+SRC_URI="https://estaticos.redsara.es/comunes/autofirma/$(ver_rs 1- /)/AutoFirma_Linux.zip -> ${P}.zip"
 
-#TODO: investigate and fix licenses https://github.com/ctt-gob-es/clienteafirma/blob/master/license/LICENSE.txt
-LICENSE="|| ( GPL-2+ EUPL-1.1 )"
+LICENSE="|| ( GPL-2 EUPL-1.1 )"
 SLOT="0"
 KEYWORDS="~amd64"
 
@@ -25,15 +23,13 @@ S=${WORKDIR}
 
 src_unpack() {
 	default
-	rpm_unpack "./${P}-1.noarch.rpm"
+	rpm_unpack "./${P}-1.noarch_FEDORA.rpm"
 }
 
 src_install() {
-	#TODO: use $(get_libdir) or mask non ~amd64 arches
 	java-pkg_dojar "usr/lib64/${PN}/${PN}.jar"
 	java-pkg_dolauncher
 	java-pkg_dojar "usr/lib64/${PN}/${PN}Configurador.jar"
-	#TODO: icons in /lib are suspect
 	doicon "usr/lib64/${PN}/${PN}.png"
 	make_desktop_entry "${PN} %u" AutoFirma "${PN}" "Utility" "Comment[es]=Aplicación de firma electrónica de la FNMT\nMimeType=x-scheme-handler/afirma"
 }