diff --git a/krb5.spec b/krb5.spec
index 8ccc583..62d3292 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -1,8 +1,3 @@
-# Force to not include the package note file
-# the non-existing package note file is pulled into krb5-config
-# and breaks any application that is using krb5 development libs
-%undefine _package_note_file
-
 %bcond_without check
 %if %{without check}
 %global skipcheck 1
@@ -436,7 +431,8 @@ sed -r -i -e 's|^libdir=/usr/lib(64)?$|libdir=/usr/lib|g' $RPM_BUILD_ROOT%{_bind
 
 # Workaround krb5-config reading too much from LDFLAGS.
 # https://bugzilla.redhat.com/show_bug.cgi?id=1997021
-sed -i -e "s/-specs=[^ ]*//g" $RPM_BUILD_ROOT%{_bindir}/krb5-config
+# https://bugzilla.redhat.com/show_bug.cgi?id=2048909
+sed -i -r -e 's/^(LDFLAGS=).*/\1/' $RPM_BUILD_ROOT%{_bindir}/krb5-config
 
 # Install processed man pages.
 for section in 1 5 8 ; do
@@ -649,6 +645,7 @@ exit 0
 %changelog
 * Tue Feb  8 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.19.2-6
 - Drop old trigger scriplet
+- Reenable package notes and strip LDFLAGS from krb5-config (rhbz#2048909)
 
 * Wed Feb 02 2022 Alexander Bokovoy <abokovoy@redhat.com> - 1.19.2-5
 - Temporarily remove package note to unblock krb5-dependent packages