diff --git a/net-misc/geoipupdate/geoipupdate-2.3.1.recipe b/net-misc/geoipupdate/geoipupdate-2.4.0.recipe
similarity index 96%
rename from net-misc/geoipupdate/geoipupdate-2.3.1.recipe
rename to net-misc/geoipupdate/geoipupdate-2.4.0.recipe
index e1cc182bf..b04d6f603 100644
--- a/net-misc/geoipupdate/geoipupdate-2.3.1.recipe
+++ b/net-misc/geoipupdate/geoipupdate-2.4.0.recipe
@@ -7,9 +7,9 @@ GeoLite2 Country and GeoLite2 City."
 HOMEPAGE="https://github.com/maxmind/geoipupdate"
 COPYRIGHT="2002-2017 MaxMind, Inc."
 LICENSE="GNU GPL v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/maxmind/geoipupdate/releases/download/v$portVersion/geoipupdate-$portVersion.tar.gz"
-CHECKSUM_SHA256="4f71e911774c4fd32e217889c242d2c311fa5ffd3df56be48a2d1aedfe2e671c"
+CHECKSUM_SHA256="8b4e88ce8d84e9c75bc681704d19ec5c63c54f01e945f7669f97fb0df7e13952"
 PATCHES="geoipupdate-$portVersion.patchset"
 
 GLOBAL_WRITABLE_FILES="settings/GeoIP.conf keep-old"
diff --git a/net-misc/geoipupdate/patches/geoipupdate-2.3.1.patchset b/net-misc/geoipupdate/patches/geoipupdate-2.4.0.patchset
similarity index 76%
rename from net-misc/geoipupdate/patches/geoipupdate-2.3.1.patchset
rename to net-misc/geoipupdate/patches/geoipupdate-2.4.0.patchset
index 084830a1c..9de17b25f 100644
--- a/net-misc/geoipupdate/patches/geoipupdate-2.3.1.patchset
+++ b/net-misc/geoipupdate/patches/geoipupdate-2.4.0.patchset
@@ -1,14 +1,14 @@
-From 4b551e57c8cfbe6e4a2dca067d018a66f995e466 Mon Sep 17 00:00:00 2001
+From 7b8be6428f449b6ea602a798555be75688371371 Mon Sep 17 00:00:00 2001
 From: fbrosson <fbrosson@localhost>
 Date: Wed, 30 Mar 2016 22:47:18 +0000
 Subject: Search for xasprintf in libroot.
 
 
 diff --git a/configure.ac b/configure.ac
-index 518030f..a1db7da 100644
+index 124dfd3..8d37da8 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -30,6 +30,7 @@ AC_CHECK_HEADERS(curl/curl.h, , AC_MSG_ERROR(curl header (curl/curl.h) not found
+@@ -29,6 +29,7 @@ AC_CHECK_HEADERS(curl/curl.h, , AC_MSG_ERROR(curl header (curl/curl.h) not found
  
  AC_CHECK_LIB(z, gzopen, [], [AC_MSG_ERROR([libz not found.])])
  AC_CHECK_LIB(curl, curl_easy_setopt, [], [AC_MSG_ERROR([libcurl not found.])])
@@ -17,10 +17,10 @@ index 518030f..a1db7da 100644
  AC_CHECK_FUNCS([ getline fgets asprintf strcasecmp memset socket strchr strdup strstr strrchr memchr strspn])
  
 -- 
-2.7.0
+2.13.1
 
 
-From b20de449da1f21dbc4d85065d8470ab2a3dc0a5b Mon Sep 17 00:00:00 2001
+From f052949a0f4ac5e016f56ff9deb106a5a4cb40aa Mon Sep 17 00:00:00 2001
 From: fbrosson <fbrosson@localhost>
 Date: Wed, 30 Mar 2016 22:47:18 +0000
 Subject: Use $sharedStateDir/GeoIP/ instead of $datadir/GeoIP/
@@ -31,40 +31,42 @@ and, at the same time, pass "`finddir B_SYSTEM_CACHE_DIRECTORY`" as
 $sharedStateDir.
 
 diff --git a/bin/Makefile.am b/bin/Makefile.am
-index b4a6e07..b2a3397 100644
+index 345ac55..99ff5ba 100644
 --- a/bin/Makefile.am
 +++ b/bin/Makefile.am
-@@ -1,4 +1,4 @@
--AM_CPPFLAGS = -I$(top_srcdir)/src -DSYSCONFDIR=\"$(sysconfdir)\" -DDATADIR=\"$(datadir)/GeoIP\" -Wall
-+AM_CPPFLAGS = -I$(top_srcdir)/src -DSYSCONFDIR=\"$(sysconfdir)\" -DSHAREDSTATEDIR=\"$(sharedstatedir)\" -Wall
+@@ -1,5 +1,5 @@
+-AM_CPPFLAGS = -I$(top_srcdir)/src -DSYSCONFDIR=\"$(sysconfdir)\" -DDATADIR=\"$(datadir)/GeoIP\" \
+-			  -std=c99 -Wall -Wextra
++AM_CPPFLAGS = -I$(top_srcdir)/src -DSYSCONFDIR=\"$(sysconfdir)\" -DSHAREDSTATEDIR=\"$(sharedstatedir)\" \
++			  -Wall
  
  bin_PROGRAMS = geoipupdate
  
 diff --git a/bin/geoipupdate_s.c b/bin/geoipupdate_s.c
-index 948e1fc..f252912 100644
+index 095e8f5..d8273e5 100644
 --- a/bin/geoipupdate_s.c
 +++ b/bin/geoipupdate_s.c
-@@ -9,7 +9,7 @@ geoipupdate_s *geoipupdate_s_new(void)
-     geoipupdate_s *gu = xmalloc(size);
-     memset(gu, 0, size);
-     gu->license_file = strdup(SYSCONFDIR "/GeoIP.conf");
+@@ -13,7 +13,7 @@ geoipupdate_s *geoipupdate_s_new(void)
+     exit_if(NULL == gu->license_file,
+             "Unable to allocate memory for license file path.\n");
+ 
 -    gu->database_dir = strdup(DATADIR);
 +    gu->database_dir = strdup(SHAREDSTATEDIR "/GeoIP");
-     gu->proto = strdup("https");
-     gu->host = strdup("updates.maxmind.com");
-     gu->proxy = strdup("");
+     exit_if(NULL == gu->database_dir,
+             "Unable to allocate memory for database directory path.\n");
+ 
 -- 
-2.7.0
+2.13.1
 
 
-From d45d2746a970be2cd9d279e368ef45124f9204be Mon Sep 17 00:00:00 2001
+From 15efa168158a57fe650a2702333741c45531e93e Mon Sep 17 00:00:00 2001
 From: fbrosson <fbrosson@localhost>
 Date: Thu, 5 Jan 2017 01:22:18 +0000
 Subject: Add table of ProductIds to GeoIP.conf
 
 
 diff --git a/conf/GeoIP.conf.default b/conf/GeoIP.conf.default
-index f9401fe..26e263d 100644
+index d3caf4f..615774a 100644
 --- a/conf/GeoIP.conf.default
 +++ b/conf/GeoIP.conf.default
 @@ -8,6 +8,19 @@
@@ -88,5 +90,5 @@ index f9401fe..26e263d 100644
  # Multiple product IDs are separated by spaces.
  ProductIds GeoLite2-Country GeoLite2-City
 -- 
-2.11.0
+2.13.1