diff --git a/.NetworkManager.metadata b/.NetworkManager.metadata
index ae7fd3d..9d57634 100644
--- a/.NetworkManager.metadata
+++ b/.NetworkManager.metadata
@@ -1 +1 @@
-fa894aa6eebcc9b352502b10fda69868eea04acd SOURCES/NetworkManager-1.31.4.tar.xz
+8d1b4a01947cad0a77a21be01fd9f3679536f7dc SOURCES/NetworkManager-1.31.5.tar.xz
diff --git a/.gitignore b/.gitignore
index cdff3f8..cac23fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/NetworkManager-1.31.4.tar.xz
+SOURCES/NetworkManager-1.31.5.tar.xz
diff --git a/SPECS/NetworkManager.spec b/SPECS/NetworkManager.spec
index bb4b044..de04cf5 100644
--- a/SPECS/NetworkManager.spec
+++ b/SPECS/NetworkManager.spec
@@ -6,8 +6,8 @@
%global epoch_version 1
%global rpm_version 1.32.0
-%global real_version 1.31.4
-%global release_version 0.3
+%global real_version 1.31.5
+%global release_version 0.4
%global snapshot %{nil}
%global git_sha %{nil}
@@ -60,10 +60,8 @@
%bcond_without ppp
%bcond_without nmtui
%bcond_without nm_cloud_setup
-
# on RHEL we don't regenerate the documentation
%bcond_with regen_docs
-
%if %{bcond_default_debug}
%bcond_without debug
%else
@@ -203,7 +201,6 @@ Requires(postun): systemd
Requires: dbus >= %{dbus_version}
Requires: glib2 >= %{glib2_version}
Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release}
-Requires: libndp >= 1.7-4
Obsoletes: dhcdbd
Obsoletes: NetworkManager < %{obsoletes_device_plugins}
Obsoletes: NetworkManager < %{obsoletes_ppp_plugin}
@@ -454,7 +451,7 @@ This package contains NetworkManager support for PPP.
%package libnm
Summary: Libraries for adding NetworkManager support to applications.
Group: Development/Libraries
-Conflicts: NetworkManager-glib < %{epoch}:%{version}-%{release}
+Conflicts: NetworkManager-glib < 1:1.31.0
License: LGPLv2+
%description libnm
@@ -522,7 +519,7 @@ Summary: NetworkManager dispatcher file for advanced routing rules
Group: System Environment/Base
BuildArch: noarch
Provides: %{name}-config-routing-rules = %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-config-routing-rules < %{epoch}:%{version}-%{release}
+Obsoletes: %{name}-config-routing-rules < 1:1.31.0
%description dispatcher-routing-rules
This adds a NetworkManager dispatcher file to support networking
@@ -984,6 +981,7 @@ fi
%dir %{_sysconfdir}/%{name}/dnsmasq-shared.d
%dir %{_sysconfdir}/%{name}/system-connections
%config(noreplace) %{_sysconfdir}/%{name}/NetworkManager.conf
+%ghost %{_sysconfdir}/%{name}/VPN
%{_bindir}/nm-online
%{_libexecdir}/nm-ifup
%ghost %attr(755, root, root) %{_sbindir}/ifup
@@ -1152,6 +1150,9 @@ fi
%changelog
+* Thu May 20 2021 Wen Liang <wenliang@redhat.com> - 1:1.32.0-0.4
+- Update to 1.31.5 (development)
+
* Wed May 5 2021 Beniamino Galvani <bgalvani@redhat.com> - 1:1.32.0-0.3
- Update to 1.31.4 (development)