diff --git a/srcpkgs/geoip-data/template b/srcpkgs/geoip-data/template
new file mode 100644
index 00000000000..4a364529c18
--- /dev/null
+++ b/srcpkgs/geoip-data/template
@@ -0,0 +1,30 @@
+# Template file for 'geoip-data'
+pkgname=geoip-data
+version=20170416
+revision=1
+create_wrksrc=yes
+short_desc="Non-DNS IP-to-country resolver C library and utilities (data files)"
+maintainer="Enno Boland <gottox@voidlinux.eu>"
+license="CC BY-SA 4.0"
+homepage="https://dev.maxmind.com/geoip/legacy/geolite/"
+distfiles="
+ http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz
+ http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz
+ http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
+ http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz
+ http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
+ http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz"
+checksum="0fff4856664bec9d6feda3467fc5273dbcd3c0a9dc1a2ad90a75bee505ad88a9
+ b0561561be6ad5fda16b8ccd903c76bfcea25a6789bf26104445c432d17a6b76
+ b4464f8695a72a011a51da910a4d2a7e3c2440d7d988fd4f19a7976072a4cb61
+ f22f36d9edb92a46003d6036f80c4e7ac955305ee73b6e875f01ec2164290d1e
+ c25bb12c2c8d9c3caca355aaf82994a83d9129d63dfbe2810be3d5ab842e5683
+ 35b77995e04f415fbfee6c24d4dafafe6c8af4bc51452bcb744b1797e53f8625"
+
+do_install() {
+	vmkdir usr/share/GeoIP
+	for i in $distfiles; do
+		local n=$(basename "$i" .gz)
+		vinstall $n 644 usr/share/GeoIP
+	done
+}
diff --git a/srcpkgs/geoip/template b/srcpkgs/geoip/template
index 10f3180e81b..57f61b13349 100644
--- a/srcpkgs/geoip/template
+++ b/srcpkgs/geoip/template
@@ -1,19 +1,18 @@
 # Template file for 'geoip'
 pkgname=geoip
-version=1.4.8
-revision=3
+version=1.6.10
+revision=1
 wrksrc="GeoIP-${version}"
 build_style=gnu-configure
 configure_args="--mandir=/usr/share/man --sysconfdir=/etc/geoip"
 hostmakedepends="automake libtool"
 makedepends="zlib-devel"
-conf_files="/etc/geoip/GeoIP.conf"
 short_desc="Non-DNS IP-to-country resolver C library and utilities"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.maxmind.com/app/c"
 license="GPL-2"
-distfiles="http://geolite.maxmind.com/download/${pkgname}/api/c/GeoIP-${version}.tar.gz"
-checksum=cf0f6b2bac1153e34d6ef55ee3851479b347d2b5c191fda8ff6a51fab5291ff4
+distfiles="https://github.com/maxmind/geoip-api-c/releases/download/v$version/GeoIP-$version.tar.gz"
+checksum=cb44e0d0dbc45efe2e399e695864e58237ce00026fba8a74b31d85888c89c67a
 
 pre_configure() {
 	autoreconf -fi
@@ -21,9 +20,9 @@ pre_configure() {
 
 libgeoip_package() {
 	short_desc+=" - Runtime library"
+	depends="geoip-data"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
-		vmove usr/share/GeoIP
 	}
 }
 
@@ -31,8 +30,8 @@ geoip-devel_package() {
 	short_desc+=" - development files"
 	depends="zlib-devel libgeoip>=${version}_${revision}"
 	pkg_install() {
-        	vmove usr/include
-        	vmove "usr/lib/*.a"
-        	vmove "usr/lib/*.so"
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 	}
 }
diff --git a/srcpkgs/geoipupdate/template b/srcpkgs/geoipupdate/template
new file mode 100644
index 00000000000..787abb15cb5
--- /dev/null
+++ b/srcpkgs/geoipupdate/template
@@ -0,0 +1,19 @@
+# Template file for 'geoipupdate'
+pkgname=geoipupdate
+version=2.3.1
+revision=1
+build_style=gnu-configure
+configure_args="--mandir=/usr/share/man --sysconfdir=/etc/geoip"
+hostmakedepends="automake libtool"
+makedepends="zlib-devel libcurl-devel"
+short_desc="GeoIP update client code "
+maintainer="Enno Boland <gottox@voidlinux.eu>"
+homepage="https://github.com/maxmind/geoipupdate"
+license="GPL-2"
+distfiles="https://github.com/maxmind/geoipupdate/releases/download/v$version/geoipupdate-$version.tar.gz"
+checksum=4f71e911774c4fd32e217889c242d2c311fa5ffd3df56be48a2d1aedfe2e671c
+conf_files="/etc/geoip/GeoIP.conf"
+
+pre_configure() {
+	autoreconf -fi
+}