diff --git a/.gitignore b/.gitignore
index a09786c..fd6d31a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 /iproute2-6.8.0.tar.xz
 /iproute2-6.10.0.tar.xz
 /iproute2-6.12.0.tar.xz
+/iproute2-6.14.0.tar.xz
+/iproute2-6.16.0.tar.xz
+/iproute2-6.17.0.tar.xz
diff --git a/README.etc b/README.etc
new file mode 100644
index 0000000..6fc09c3
--- /dev/null
+++ b/README.etc
@@ -0,0 +1,16 @@
+You are looking for your iproute2 config in /etc/iproute2 and it's gone?
+
+Here's an explanation on what's going on:
+
+From v6.5.0, iproute2 supports stateless configuration pattern. This
+means that iproute2 now read its config from /etc/iproute2/FOO, and,
+if it does not exist, fall back to /usr/share/iproute2/FOO.
+
+You can find iproute2 default configuration in /usr/share/iproute2,
+while you can store your user-modified config files in /etc/iproute2.
+
+/usr/share/iproute2 files are not supposed to be manually modified.
+
+If a previous update broke your user config for iproute2, you may
+have one or more ".rpmsave" files in /etc/iproute2. You can restore
+your config simply dropping the ".rpmsave" suffix from the file name.
diff --git a/iproute.spec b/iproute.spec
index 7f7570b..77088b9 100644
--- a/iproute.spec
+++ b/iproute.spec
@@ -1,10 +1,13 @@
 Summary:            Advanced IP routing and network device configuration tools
 Name:               iproute
-Version:            6.12.0
+Version:            6.17.0
 Release:            %autorelease
 URL:                https://kernel.org/pub/linux/utils/net/%{name}2/
 Source0:            https://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz
+%if 0%{?rhel}
 Source1:            rt_dsfield.deprecated
+%endif
+Source2:            README.etc
 
 License:            GPL-2.0-or-later AND NIST-PD
 BuildRequires:      bison
@@ -90,12 +93,28 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a
 # drop these files, iproute-doc package extracts files directly from _builddir
 rm -rf '%{buildroot}%{_docdir}'
 
+mkdir -p %{buildroot}%{_sysconfdir}/iproute2
+cp %{SOURCE2} %{buildroot}%{_sysconfdir}/iproute2/README
+
 # append deprecated values to rt_dsfield for compatibility reasons
 %if 0%{?rhel}
 cat %{SOURCE1} >>%{buildroot}%{_datadir}/iproute2/rt_dsfield
+cp %{SOURCE2} %{buildroot}%{_datadir}/iproute2/README
+
+# RHEL-94662: restore /etc/iproute2 conf files, if modified
+# this is safe because we don't have conf files in /etc/iproute2 anymore, so
+# every *.rpmsave file over there is a leftover from a failed conf upgrade
+
+%posttrans
+if [ -f /etc/iproute2/*rpmsave ]; then
+  for conffile in /etc/iproute2/*rpmsave; do
+    mv $conffile ${conffile%.rpmsave}
+  done
+fi
 %endif
 
 %files
+%dir %{_sysconfdir}/iproute2
 %dir %{_datadir}/iproute2
 %license COPYING
 %doc README README.devel
@@ -104,8 +123,10 @@ cat %{SOURCE1} >>%{buildroot}%{_datadir}/iproute2/rt_dsfield
 %{_mandir}/man8/*
 %exclude %{_mandir}/man8/tc*
 %exclude %{_mandir}/man8/cbq*
-%attr(644,root,root) %config(noreplace) %{_datadir}/iproute2/*
+%exclude %{_mandir}/man8/arpd*
+%attr(644,root,root) %config %{_datadir}/iproute2/*
 %{_sbindir}/*
+%attr(644,root,root) %{_sysconfdir}/iproute2/*
 %exclude %{_sbindir}/tc
 %exclude %{_sbindir}/routel
 %{_datadir}/bash-completion/completions/devlink
diff --git a/sources b/sources
index 7074a5d..9ad54ed 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,6 @@
 SHA512 (iproute2-6.8.0.tar.xz) = 54e50340a73c8810d69bfd54704b469149731634a97d94da08b5a305592a812131a441e5b646e32b480d61840e2ade29387e54b934effeee8ded4f06e557a5c0
 SHA512 (iproute2-6.10.0.tar.xz) = 706479aa37a25fcf30c525c6abd85e0861e484d046e0636a28dbc52b958d45c9dba70b912f530dedd4b0b496e4b98969e23501bbbb41d3de50810bae014fcb41
 SHA512 (iproute2-6.12.0.tar.xz) = dbd6afb8162a6086e4be9045b8dc53aa563bd4b7abaf43ee13cd7d493730ff0b90e6985f68c6f42d64f4af6a692d0589e0cefd2f24045ec1c10418cfb73940b2
+SHA512 (iproute2-6.14.0.tar.xz) = e79049bdca0e0381f0a93a40e4d597ce59fb509dabc6e8b04a510ff9953f091c67577d6faa62967bd197bf62ab6e56d928558270a1390621431acb237b77fa46
+SHA512 (iproute2-6.16.0.tar.xz) = 88930ea1a3a901594a69dc04e533bfd1de0f5b79f176dedb45f11f01035bd680edccc8e04e56d0922ee430580581c646473a3baa941254739878f7ab946f17df
+SHA512 (iproute2-6.17.0.tar.xz) = 3d83d49233c1d984f15d285a46e2ec0eeb820c7cb84cfc84866921f37e8a57d31bc3953be07e8c79ed6079f326a25c3a85f591b0d67f9f689c0c70ccdb0fef77