diff --git a/pulseaudio.spec b/pulseaudio.spec
index 2bc84ce..a40a5ca 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -34,7 +34,7 @@
 Name:           pulseaudio
 Summary:        Improved Linux Sound Server
 Version:        %{pa_major}%{?pa_minor:.%{pa_minor}}
-Release:        5%{?snap:.%{snap}git%{shortcommit}}%{?dist}
+Release:        6%{?snap:.%{snap}git%{shortcommit}}%{?dist}
 License:        LGPL-2.1-or-later
 URL:            http://www.freedesktop.org/wiki/Software/PulseAudio
 %if 0%{?gitrel}
@@ -207,8 +207,7 @@ GSettings configuration backend for the PulseAudio sound server.
 
 %package libs
 Summary:        Libraries for PulseAudio clients
-# Automatically converted from old format: LGPLv2+ - review is highly recommended.
-License:        LicenseRef-Callaway-LGPLv2+
+License:        LGPL-2.1-or-later
 Obsoletes:      pulseaudio-libs-zeroconf < 1.1
 
 %description libs
@@ -217,8 +216,7 @@ to interface with a PulseAudio sound server.
 
 %package libs-glib2
 Summary:        GLIB 2.x bindings for PulseAudio clients
-# Automatically converted from old format: LGPLv2+ - review is highly recommended.
-License:        LicenseRef-Callaway-LGPLv2+
+License:        LGPL-2.1-or-later
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description libs-glib2
@@ -227,8 +225,7 @@ a GLIB 2.x based application.
 
 %package libs-devel
 Summary:        Headers and libraries for PulseAudio client development
-# Automatically converted from old format: LGPLv2+ - review is highly recommended.
-License:        LicenseRef-Callaway-LGPLv2+
+License:        LGPL-2.1-or-later
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:       %{name}-libs-glib2%{?_isa} = %{version}-%{release}
 %description libs-devel
@@ -237,8 +234,7 @@ a PulseAudio sound server.
 
 %package utils
 Summary:        PulseAudio sound server utilities
-# Automatically converted from old format: LGPLv2+ - review is highly recommended.
-License:        LicenseRef-Callaway-LGPLv2+
+License:        LGPL-2.1-or-later
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 # when made non-multilib'd, https://bugzilla.redhat.com/891425
 Obsoletes:      pulseaudio-utils < 3.0-3
@@ -249,8 +245,7 @@ This package contains command line utilities for the PulseAudio sound server.
 %if 0%{?gdm_hooks}
 %package gdm-hooks
 Summary:        PulseAudio GDM integration
-# Automatically converted from old format: LGPLv2+ - review is highly recommended.
-License:        LicenseRef-Callaway-LGPLv2+
+License:        LGPL-2.1-or-later
 Requires:       gdm >= 1:2.22.0
 # for the gdm user
 Requires(pre):  gdm
@@ -673,6 +668,10 @@ systemctl --no-reload preset --global pulseaudio.socket >/dev/null 2>&1 || :
 
 
 %changelog
+* Thu Dec 05 2024 Wim Taymans <wtaymans@redhat.com> - 17.0-6
+- Fix license fields some more
+  Resolves: DESKTOP-1151
+
 * Thu Dec 05 2024 Wim Taymans <wtaymans@redhat.com> - 17.0-5
 - Fix license field
   Resolves: DESKTOP-1151