diff --git a/.GeoIP.metadata b/.GeoIP.metadata
index c7a7640..2a01620 100644
--- a/.GeoIP.metadata
+++ b/.GeoIP.metadata
@@ -1,7 +1,7 @@
 09abf240ad4c4c3743113465d01b7c74b3140b9f SOURCES/GeoIP-1.5.0.tar.gz
-33f8591f3c5a835cdde7c4f2a8f3ca410672a574 SOURCES/GeoIP.dat.gz
-65bf38a1bef6121b3e230ea81c63a6e55c777e9d SOURCES/GeoIPASNum.dat.gz
-2edb7344c32b78e6525d56674fb481e350033eaa SOURCES/GeoIPASNumv6.dat.gz
-d024122356cb94bcc35019cf0232ddf1c4133e91 SOURCES/GeoIPv6.dat.gz
-e7931b124c52c8ddf0b7c1df15d7189def2ff30b SOURCES/GeoLiteCity.dat.gz
-60f5f6d278b407f8fdfbe1f390cb7a0d2e3cca9f SOURCES/GeoLiteCityv6.dat.gz
+1342a88b7ec340f7047f34de5ed722ac37c38fe0 SOURCES/GeoIP.dat.gz
+4ec0df2fd67f7d17d581ad5c1b96aa87d6c838e8 SOURCES/GeoIPASNum.dat.gz
+4085ecf9a64a10214f33a350c2a299b4c292117b SOURCES/GeoIPASNumv6.dat.gz
+3b7cc30ddfc2f559c14b798f1d7e52241a7d9cdc SOURCES/GeoIPv6.dat.gz
+bb7eca125c87d4df7d41035d3eaafd8be9da9e18 SOURCES/GeoLiteCity.dat.gz
+a15de3d2059fef4b0e77f3a3bb1b95ac6090eba1 SOURCES/GeoLiteCityv6.dat.gz
diff --git a/SOURCES/GeoIP-1.5.0-geoipupdate-message.patch b/SOURCES/GeoIP-1.5.0-geoipupdate-message.patch
new file mode 100644
index 0000000..fd67278
--- /dev/null
+++ b/SOURCES/GeoIP-1.5.0-geoipupdate-message.patch
@@ -0,0 +1,13 @@
+diff --git a/libGeoIP/GeoIPUpdate.c.old b/libGeoIP/GeoIPUpdate.c
+index c5a4241..28279cb 100644
+--- a/libGeoIP/GeoIPUpdate.c.old
++++ b/libGeoIP/GeoIPUpdate.c
+@@ -823,7 +823,7 @@ short int GeoIP_update_database_general (char * user_id,char * license_key,char
+ 		free(buf);
+ 		GeoIP_printf(f, "%s is up to date, no updates required\n", geoipfilename);
+ 		return GEOIP_NO_NEW_UPDATES;
+-	} else if (strstr(compr, "Invalid UserId") != NULL){
++	} else if (strstr(compr, "Invalid user ID") != NULL){
+ 		free(buf);
+ 		return GEOIP_USER_ID_INVALID_ERR;
+ 	} else if (strstr(compr, "Invalid product ID or subscription expired") != NULL){
diff --git a/SOURCES/geoipupdate.cron b/SOURCES/geoipupdate.cron
index 892b974..3023cf3 100644
--- a/SOURCES/geoipupdate.cron
+++ b/SOURCES/geoipupdate.cron
@@ -2,3 +2,5 @@
 
 geoipupdate > /dev/null && \
 	ln -sf GeoLiteCountry.dat /usr/share/GeoIP/GeoIP.dat
+geoipupdate > /dev/null && \
+	ln -sf GeoLiteCity.dat /usr/share/GeoIP/GeoIPCity.dat
diff --git a/SPECS/GeoIP.spec b/SPECS/GeoIP.spec
index d3b813a..caf195f 100644
--- a/SPECS/GeoIP.spec
+++ b/SPECS/GeoIP.spec
@@ -3,7 +3,7 @@
 
 Name:		GeoIP
 Version:	1.5.0
-Release:	11%{?dist}
+Release:	13%{?dist}
 Summary:	Library for country/city/organization to IP address or hostname mapping
 Group:		Development/Libraries
 License:	LGPLv2+ and GPLv2+ and CC-BY-SA
@@ -21,6 +21,8 @@ Source13:	http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/
 Source14:	http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
 Source15:	http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz
 Patch10:	GeoIP-1.5.0-UTF8.patch
+Patch11:	GeoIP-1.5.0-geoipupdate-message.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildRequires:	zlib-devel
 Obsoletes:	geoip < %{version}-%{release}
@@ -79,6 +81,7 @@ Development headers and static libraries for building GeoIP-based applications.
 
 # Recode docs as UTF-8
 %patch10 -p1
+%patch11 -p1
 
 install -D -m644 %{SOURCE1} LICENSE.txt
 install -D -m644 %{SOURCE2} fetch-geoipdata-city.pl
@@ -151,8 +154,14 @@ chmod 644 %{buildroot}%{_datadir}/GeoIP/GeoIP{ASNum,City,Country}{,v6}.dat
 ln -sf GeoIP-initial.dat %{buildroot}%{_datadir}/GeoIP/GeoIP.dat
 ln -sf GeoIPv6-initial.dat %{buildroot}%{_datadir}/GeoIP/GeoIPv6.dat
 
-%clean
-rm -rf %{buildroot}
+#links used when invoking geoiplookup -v
+ln -sf GeoIPCity-initial.dat %{buildroot}%{_datadir}/GeoIP/GeoIPCity.dat
+ln -sf GeoIPCityv6-initial.dat %{buildroot}%{_datadir}/GeoIP/GeoIPCityv6.dat
+
+# Add compat symlinks for GeoIPASNum.dat and GeoLiteASNumv6.dat
+# ([upstream] database names used in the old geoip-geolite package)
+ln -sf GeoIPASNum.dat %{buildroot}%{_datadir}/GeoIP/GeoIPASNum.dat
+ln -sf GeoIPASNumv6.dat %{buildroot}%{_datadir}/GeoIP/GeoIPASNumv6.dat
 
 %post -p /sbin/ldconfig
 
@@ -230,6 +239,14 @@ fi
 %{_libdir}/libGeoIPUpdate.so
 
 %changelog
+* Tue Jul 31 2018 Michal Ruprich <mruprich@redhat.com> - 1.5.0-13
+- Related: #1409060 -  Missing symlink at the GeoIP-update package
+
+* Tue Jun 19 2018 Michal Ruprich <mruprich@redhat.com> - 1.5.0-12
+- Removed clean section
+- Resolves: #1589860 - Update GeoIP legacy databases
+- Resolves: #1409060 -  Missing symlink at the GeoIP-update package
+
 * Wed Jun 29 2016 Jan Safranek <jsafrane@redhat.com> - 1.5.0-11
 - Fixed rpmlint errors