diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass
index 8b3ee0bcebd27..cebd8f69d5dbb 100644
--- a/eclass/ant-tasks.eclass
+++ b/eclass/ant-tasks.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
 
 # @ECLASS: ant-tasks.eclass
@@ -69,15 +69,13 @@ elif [[ ${PV} == *_rc* ]]; then
 else
 	# default for final releases
 	MY_PV=${PV}
-	UPSTREAM_PREFIX="mirror://apache/ant/source"
 	case ${PV} in
 	1.9.*)
+		UPSTREAM_PREFIX="https://archive.apache.org/dist/ant/source"
 		GENTOO_PREFIX="https://dev.gentoo.org/~tomwij/files/dist"
 		;;
-	1.8.4)
-		GENTOO_PREFIX="https://dev.gentoo.org/~sera/distfiles"
-		;;
 	*)
+		UPSTREAM_PREFIX="mirror://apache/ant/source"
 		GENTOO_PREFIX="https://dev.gentoo.org/~caster/distfiles"
 		;;
 	esac