diff --git a/.NetworkManager.metadata b/.NetworkManager.metadata
index 0c0ea0a..b6da699 100644
--- a/.NetworkManager.metadata
+++ b/.NetworkManager.metadata
@@ -1 +1 @@
-b1bf81a9c8ff1372757f33e2573ac0bc0462197c SOURCES/NetworkManager-1.25.1.tar.xz
+61e13a5d63e3b1205791618c25ee421750e2953c SOURCES/NetworkManager-1.25.2.tar.xz
diff --git a/.gitignore b/.gitignore
index 1fc1a2a..2be7810 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/NetworkManager-1.25.1.tar.xz
+SOURCES/NetworkManager-1.25.2.tar.xz
diff --git a/SPECS/NetworkManager.spec b/SPECS/NetworkManager.spec
index b2efad0..e22499e 100644
--- a/SPECS/NetworkManager.spec
+++ b/SPECS/NetworkManager.spec
@@ -5,8 +5,8 @@
 %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
 
 %global epoch_version 1
-%global rpm_version 1.25.1
-%global real_version 1.25.1
+%global rpm_version 1.25.2
+%global real_version 1.25.2
 %global release_version 1
 %global snapshot %{nil}
 %global git_sha %{nil}
@@ -76,6 +76,11 @@
 %else
 %bcond_without iwd
 %endif
+%if 0%{?fedora} > 31 || 0%{?rhel} > 7
+%bcond_without firewalld_zone
+%else
+%bcond_with firewalld_zone
+%endif
 
 ###############################################################################
 
@@ -244,10 +249,17 @@ BuildRequires: polkit-devel
 BuildRequires: jansson-devel
 %if %{with sanitizer}
 BuildRequires: libasan
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 8
 BuildRequires: libubsan
 %endif
 %endif
+%if %{with firewalld_zone}
+BuildRequires: firewalld-filesystem
+%endif
+BuildRequires: iproute
+%if 0%{?fedora} || 0%{?rhel} > 7
+BuildRequires: iproute-tc
+%endif
 
 Provides: %{name}-dispatcher%{?_isa} = %{epoch}:%{version}-%{release}
 
@@ -395,19 +407,18 @@ This package contains NetworkManager support for PPP.
 
 
 %package libnm
-Summary: Libraries for adding NetworkManager support to applications (new API).
+Summary: Libraries for adding NetworkManager support to applications.
 Group: Development/Libraries
 Conflicts: NetworkManager-glib < %{epoch}:%{version}-%{release}
 License: LGPLv2+
 
 %description libnm
 This package contains the libraries that make it easier to use some
-NetworkManager functionality from applications.  This is the new
-NetworkManager API.  See also NetworkManager-glib.
+NetworkManager functionality from applications.
 
 
 %package libnm-devel
-Summary: Header files for adding NetworkManager support to applications (new API).
+Summary: Header files for adding NetworkManager support to applications.
 Group: Development/Libraries
 Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: glib2-devel
@@ -416,8 +427,7 @@ License: LGPLv2+
 
 %description libnm-devel
 This package contains the header and pkg-config files for development
-applications using NetworkManager functionality from applications.  This
-is the new NetworkManager API. See also NetworkManager-glib-devel.
+applications using NetworkManager functionality from applications.
 
 
 %if %{with connectivity_fedora}
@@ -617,6 +627,11 @@ This tool is still experimental.
 	-Dpppd_plugin_dir=%{_libdir}/pppd/%{ppp_version} \
 	-Dppp=true \
 %endif
+%if %{with firewalld_zone}
+	-Dfirewalld_zone=true \
+%else
+	-Dfirewalld_zone=false \
+%endif        
 	-Ddist_version=%{version}-%{release} \
 	-Dconfig_plugins_default=%{config_plugins_default} \
 	-Dconfig_dns_rc_manager_default=%{dns_rc_manager_default} \
@@ -647,8 +662,10 @@ intltoolize --automake --copy --force
 %endif
 %if %{with sanitizer}
 	--with-address-sanitizer=exec \
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 8
 	--enable-undefined-sanitizer \
+%else
+	--disable-undefined-sanitizer \
 %endif
 %else
 	--with-address-sanitizer=no \
@@ -748,6 +765,11 @@ intltoolize --automake --copy --force
 	--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
 	--enable-ppp=yes \
 %endif
+%if %{with firewalld_zone}
+	--enable-firewalld-zone \
+%else
+	--disable-firewalld-zone \
+%endif        
 	--with-dist-version=%{version}-%{release} \
 	--with-config-plugins-default=%{config_plugins_default} \
 	--with-config-dns-rc-manager-default=%{dns_rc_manager_default} \
@@ -830,6 +852,9 @@ fi
 %post
 /usr/bin/udevadm control --reload-rules || :
 /usr/bin/udevadm trigger --subsystem-match=net || :
+%if %{with firewalld_zone}
+%firewalld_reload
+%endif
 
 %systemd_post %{systemd_units}
 
@@ -871,6 +896,9 @@ fi
 %postun
 /usr/bin/udevadm control --reload-rules || :
 /usr/bin/udevadm trigger --subsystem-match=net || :
+%if %{with firewalld_zone}
+%firewalld_reload
+%endif
 
 %systemd_postun %{systemd_units}
 
@@ -936,6 +964,9 @@ fi
 %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
 %{_datadir}/polkit-1/actions/*.policy
 %{_prefix}/lib/udev/rules.d/*.rules
+%if %{with firewalld_zone}
+%{_prefix}/lib/firewalld/zones/nm-shared.xml
+%endif
 # systemd stuff
 %{systemd_dir}/NetworkManager.service
 %{systemd_dir}/NetworkManager-wait-online.service
@@ -1066,6 +1097,15 @@ fi
 
 
 %changelog
+* Fri May 29 2020 Beniamino Galvani <bgalvani@redhat.com> - 1:1.25.2-1
+- update to 1.25.2 (development)
+- support ethtool coalesce and ring options (rh #1614700)
+- core: improve synchronization of qdiscs with kernel (rh #1815875)
+- team: support running without D-Bus (rh #1784363)
+- core: fix potential crash when autoactivating child connections (rh #1778073)
+- ethernet: reset original autonegotiation/speed/duplex settings on deactivation (rh #1807171)
+- core: fix setting IPv6 token in kernel (rh #1819680)
+
 * Fri May  8 2020 Thomas Haller <thaller@redhat.com> - 1:1.25.1-1
 - update to 1.25.1 (development)
 - improve documentation (rh #1651594, rh #1819259)