diff --git a/.gitignore b/.gitignore
index 14c17cd..2e600d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -181,3 +181,14 @@
 /gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
 /ocserv-0.12.4.tar.xz.sig
 /ocserv-0.12.4.tar.xz
+/ocserv.init
+/gpgkey-56EE7FA9E8173B19FE86268D763712747F343FA7.gpg
+/ocserv-script
+/ocserv-genkey
+/PACKAGE-LICENSING
+/ocserv-pamd.conf
+/ocserv.service
+/ocserv.conf
+/gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
+/ocserv-0.12.5.tar.xz.sig
+/ocserv-0.12.5.tar.xz
diff --git a/ocserv.spec b/ocserv.spec
index 78bc59f..7037de8 100644
--- a/ocserv.spec
+++ b/ocserv.spec
@@ -1,6 +1,6 @@
 # This spec file has been automatically updated
-Version:	0.12.4
-Release: 2%{?dist}
+Version:	0.12.5
+Release: 1%{?dist}
 %global _hardened_build 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 7
@@ -13,16 +13,16 @@ Release: 2%{?dist}
 
 %if 0%{?fedora} >= 28 || 0%{?rhel} > 7
 %define use_libwrap 0
+%define use_geoip 0
 %else
 %define use_libwrap 1
+%define use_geoip 1
 %endif
 
 %if 0%{?rhel} && 0%{?rhel} == 8
 %define use_http_parser 0
-%define use_geoip 0
 %else
 %define use_http_parser 1
-%define use_geoip 1
 %endif
 
 %define use_local_protobuf 0
@@ -82,6 +82,8 @@ BuildRequires:	lz4-devel
 BuildRequires:	readline-devel
 %if %{use_geoip}
 BuildRequires:	GeoIP-devel
+%else
+BuildRequires:	libmaxminddb-devel
 %endif
 
 %if %{use_systemd}
@@ -276,6 +278,9 @@ install -D -m 0755 %{SOURCE11} %{buildroot}/%{_initrddir}/%{name}
 %endif
 
 %changelog
+* Wed Oct 16 2019 Nikos Mavrogiannopoulos <nmav@gnutls.org> - 0.12.5-1
+- Update to upstream 0.12.5 release
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index 7a8dae7..585bfb5 100644
--- a/sources
+++ b/sources
@@ -7,5 +7,5 @@ SHA512 (ocserv-pamd.conf) = 3a75f19d89ddd164f3faa9c3579c7f675fc58413a194f43ec28e
 SHA512 (ocserv.service) = 2b258b2e9d211c9626e9e5c67b6c2573b713e0f490917ed1c84c2bb2708f874026ddb55dceb9585e491f86de5d3c8cd400bba864d12966ae96609cc4ce6413d2
 SHA512 (ocserv.conf) = 5b68a3547c6c69bf7c2b322692d6382162a587c47edad97690223c36f30ed98d3869d1ce063c630740d91888a4d70aadd657ddc6052c10e6e26800fca2e9d0c0
 SHA512 (gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg) = 3b1989dc6a64d1140f83a2af0773da2adb03c50d97b6da7357cf09525050651aafa21131f1e3180baa540a8af922119a256f5ff5bcd6602996a806e8e1816bad
-SHA512 (ocserv-0.12.4.tar.xz.sig) = 8ac5a5a7b3b4dcedce4a497cba923092e0035c816ea0d6b9a888102aeb03889af101259eb392d676501717abdc7544b78f60054f4409835022cf2a6949e795ff
-SHA512 (ocserv-0.12.4.tar.xz) = 5483cede9627886912f9620d358f1a22504b5de2653529e4275f4b96e4fc874b264877ff0c9ef85c9a0662253d0de44950c4f3a8410fea427d742cc733d5f741
+SHA512 (ocserv-0.12.5.tar.xz.sig) = 049cf165ba148090a6b21bbb17d68c0c35936e904ab5731a7a8473cd85944af955ea738b87ce580cdb8c3524bdca8a3361d1f30895cf7e272682b1061902b3bf
+SHA512 (ocserv-0.12.5.tar.xz) = b6e6262fbf5f00639253f85ce8ed0b10d8b45dbcdf4325cbba7f5a80fee979d556f23a635df36b85b307f12b7e5bd44165d8631624500d52168170ca00a166aa