diff --git a/.ethtool.metadata b/.ethtool.metadata
index b14d606..39c4531 100644
--- a/.ethtool.metadata
+++ b/.ethtool.metadata
@@ -1,2 +1,2 @@
-deb5080ea35810e62f228cc4ca68c34a18c549e4 SOURCES/ethtool-6.11.tar.xz
+aad9291bea6d29e288ac8d0ce0cb5c0b25e4d305 SOURCES/ethtool-6.15.tar.xz
 7cf93f0c53feec1e86e9c5c8bba2a32fa19a888d SOURCES/gpgkey-D2CB120AB45957B721CD9596F4554567B91DE934.gpg
diff --git a/.gitignore b/.gitignore
index 467461c..b3f3770 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/ethtool-6.11.tar.xz
+SOURCES/ethtool-6.15.tar.xz
 SOURCES/gpgkey-D2CB120AB45957B721CD9596F4554567B91DE934.gpg
diff --git a/SOURCES/0001-netlink-fix-missing-headers-in-text-output.patch b/SOURCES/0001-netlink-fix-missing-headers-in-text-output.patch
new file mode 100644
index 0000000..5abebe1
--- /dev/null
+++ b/SOURCES/0001-netlink-fix-missing-headers-in-text-output.patch
@@ -0,0 +1,64 @@
+From b70c928661024cd07914feb49122275daab904ea Mon Sep 17 00:00:00 2001
+From: Jakub Kicinski <kuba@kernel.org>
+Date: Sat, 12 Jul 2025 07:51:05 -0700
+Subject: [PATCH] netlink: fix missing headers in text output
+
+The commit under fixes added a NULL-check which prevents us from
+printing text headers. Conversions to add JSON support often use:
+
+  print_string(PRINT_FP, NULL, "some text:\n", NULL);
+
+to print in plain text mode.
+
+Correct output:
+
+  Channel parameters for vpn0:
+  Pre-set maximums:
+  RX:		n/a
+  TX:		n/a
+  Other:		n/a
+  Combined:	1
+  Current hardware settings:
+  RX:		n/a
+  TX:		n/a
+  Other:		n/a
+  Combined:	0
+
+With the buggy patch:
+
+  Channel parameters for vpn0:
+  RX:		n/a
+  TX:		n/a
+  Other:		n/a
+  Combined:	1
+  RX:		n/a
+  TX:		n/a
+  Other:		n/a
+  Combined:	0
+
+Fixes: fd328ccb3cc0 ("json_print: add NULL check before jsonw_string_field() in print_string()")
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+---
+ json_print.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/json_print.c b/json_print.c
+index 4f61640..e07c651 100644
+--- a/json_print.c
++++ b/json_print.c
+@@ -143,10 +143,11 @@ void print_string(enum output_type type,
+ 	} else if (_IS_FP_CONTEXT(type)) {
+ 		if (value)
+ 			fprintf(stdout, fmt, value);
++		else
++			fprintf(stdout, "%s", fmt);
+ 	}
+ }
+ 
+-
+ /*
+  * value's type is bool. When using this function in FP context you can't pass
+  * a value to it, you will need to use "is_json_context()" to have different
+-- 
+2.49.0
+
diff --git a/SOURCES/ethtool-6.11.tar.sign b/SOURCES/ethtool-6.11.tar.sign
deleted file mode 100644
index a86b1a2..0000000
--- a/SOURCES/ethtool-6.11.tar.sign
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCAAdFiEEWN3j3bieVmp26mKO538sG/LRdpUFAmcFm5gACgkQ538sG/LR
-dpXPiQgAxzfD5dagzN0gwjqx1TnjMwHcb0Gh8B6yH8NFlAW1ryUjYOmmg2aP+Wn+
-ZFD8YOMm4DfMjg23nfdFyc74VItLwP7m9b1fqH2sErtLK4lxl/3VGD5fHXrFOmGQ
-5KkKLrNCE44+FktGjeFiMm1jYCGU7Vy28PF0pURJ/aYLDUlyGyxP7vWFfWX03CZE
-0nGKu7XjtRJ8Yb0nPkBcs7/l4hsYuO89QnBkiIpyfOIuoXYTL/zRhi54pCOnmb30
-F2q1MBS4ez1Qb7Vsk2nHz+GnE/aKAxtml9ZFbrUQ/hreXTHRFFy2CRmPO33sS4av
-FFctWfiH4An4vp5iQYPfquaixHBx0A==
-=Z3Jy
------END PGP SIGNATURE-----
diff --git a/SOURCES/ethtool-6.15.tar.sign b/SOURCES/ethtool-6.15.tar.sign
new file mode 100644
index 0000000..87487da
--- /dev/null
+++ b/SOURCES/ethtool-6.15.tar.sign
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCAAdFiEEWN3j3bieVmp26mKO538sG/LRdpUFAmhZmiIACgkQ538sG/LR
+dpUtyAf6Ak8kXDF8OuimaOPcJl8ikBlBIhfrVrTDelugmaBsZhJGlsDZE+0a8UXU
+QyiOfSRstjLQB7XG0r5PNECDZGPj3UXYB7nVYZ+wOCp5ebN2yIc4oq44GL7XczBn
+AR8F7E1mAk+lSBS76PAzrFWr/nAvhlVDuVtcFo+3MAF+8fH+F/kbUlQMrsxbTeBd
+u6l6nmm7W+6zAjxG//arJBA1ROpjoYy+9YSrq2FX+Hf89ZyAG7b/WWwPixcOZ3/i
+Qdd5lzkPMHfh1MmP9YlSJiHpBJZ5Jtjdcju+5jy62tzWSiA7tpEixGccyM8BhcfV
+yZHWVzo1NNcgOLoY8C16wijj3d5Ajw==
+=ohBd
+-----END PGP SIGNATURE-----
diff --git a/SPECS/ethtool.spec b/SPECS/ethtool.spec
index cde953f..3788c6c 100644
--- a/SPECS/ethtool.spec
+++ b/SPECS/ethtool.spec
@@ -1,13 +1,14 @@
 Summary:        Settings tool for Ethernet NICs
 Name:           ethtool
 Epoch:          2
-Version:        6.11
-Release:        1%{?dist}
+Version:        6.15
+Release:        2%{?dist}
 License:        GPLv2
 URL:            https://www.kernel.org/pub/software/network/%{name}/
 Source0:        https://www.kernel.org/pub/software/network/%{name}/%{name}-%{version}.tar.xz
 Source1:        https://www.kernel.org/pub/software/network/%{name}/%{name}-%{version}.tar.sign
 Source2:        gpgkey-D2CB120AB45957B721CD9596F4554567B91DE934.gpg
+Patch0:         0001-netlink-fix-missing-headers-in-text-output.patch
 BuildRequires:  gnupg2, xz
 BuildRequires:  gcc
 BuildRequires:  libmnl-devel
@@ -22,6 +23,7 @@ network devices, especially of Ethernet devices.
 %prep
 xzcat '%{SOURCE0}' | %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data=-
 %setup -q
+%autosetup -p1
 
 %build
 %configure
@@ -41,8 +43,17 @@ make check
 %dir %{_datadir}/bash-completion/completions/
 %{_datadir}/bash-completion/completions/%{name}
 %{_mandir}/man8/%{name}.8*
+%{_datadir}/metainfo/org.kernel.software.network.ethtool.metainfo.xml
 
 %changelog
+* Thu Jul 31 2025 Mohammad Heib <mheib@redhat.com> - 2:6.15-2
+- netlink: fix missing headers in text output.
+  Resolves: RHEL-106540
+
+* Tue Jun 24 2025 Mohammad Heib <mheib@redhat.com> - 2:6.15-1
+- Update to latest upstream release v6.15.
+  Resolves: RHEL-94954
+
 * Wed Oct  9 2024 Ivan Vecera <ivecera@redhat.com> - 2:6.11-1
 - Upgrade to 6.11 (RHEL-60269)