diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index dab39fe0d5a..234ae22c3aa 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,8 +1,8 @@
 # Template file for 'nginx'
 pkgname=nginx
 version=1.6.2
-revision=5
-makedepends="pcre-devel>=8.30 libressl-devel>=2.1.4"
+revision=6
+makedepends="pcre-devel>=8.30 libressl-devel>=2.1.4 $(vopt_if geoip geoip-devel)"
 if [ "$CROSS_BUILD" ]; then
 	# fake configure run on host
 	hostmakedepends=$makedepends
@@ -30,7 +30,8 @@ homepage="http://nginx.org"
 distfiles="http://nginx.org/download/nginx-$version.tar.gz"
 checksum=b5608c2959d3e7ad09b20fc8f9e5bd4bc87b3bc8ba5936a513c04ed8f1391a18
 
-build_options="systemd"
+build_options="systemd geoip"
+build_options_default="geoip"
 replaces="runit-void<20141013_2"
 
 do_configure() {
@@ -63,7 +64,8 @@ do_configure() {
 		--with-http_gzip_static_module \
 		--with-http_realip_module \
 		--with-http_ssl_module \
-		--with-http_stub_status_module
+		--with-http_stub_status_module \
+		$(vopt_with geoip http_geoip_module)
 
 	if [ "$CROSS_BUILD" ]; then
 		case "$XBPS_TARGET_MACHINE" in