diff --git a/srcpkgs/geoip-data/template b/srcpkgs/geoip-data/template
index 5f02727bcf..63f530504a 100644
--- a/srcpkgs/geoip-data/template
+++ b/srcpkgs/geoip-data/template
@@ -10,19 +10,20 @@ homepage="https://dev.maxmind.com/geoip/legacy/geolite/"
 noarch=yes
 
 do_fetch() {
-	$XBPS_FETCHCMD http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz
-	$XBPS_FETCHCMD http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz
-	$XBPS_FETCHCMD http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
-	$XBPS_FETCHCMD http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz
-	$XBPS_FETCHCMD http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
-	$XBPS_FETCHCMD http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz
+	$XBPS_FETCH_CMD http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz
+	$XBPS_FETCH_CMD http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz
+	$XBPS_FETCH_CMD http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
+	$XBPS_FETCH_CMD http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz
+	$XBPS_FETCH_CMD http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
+	$XBPS_FETCH_CMD http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz
 }
 
 do_install() {
 	local f
 	vmkdir usr/share/GeoIP
 	for f in GeoIP GeoIPv6 GeoLiteCity GeoLiteCityv6 GeoIPASNum GeoIPASNumv6; do
-		zcat $XBPS_SRCDISTDIR/$pkgname-$version/${f}.dat.gz > ${f}.dat
+		zcat ../${f}.dat.gz > ${f}.dat
+		rm -f ../${f}.dat.gz
 		vinstall ${f}.dat 644 usr/share/GeoIP
 	done
 }