diff --git a/.gitignore b/.gitignore
index 9a189b3..a2a6059 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,6 @@
 /pkgconf-1.8.0.tar.xz
 /pkgconf-1.9.4.tar.xz
 /pkgconf-1.9.5.tar.xz
+/pkgconf-2.1.0.tar.xz
+/pkgconf-2.1.1.tar.xz
+/pkgconf-2.3.0.tar.xz
diff --git a/pkgconf.spec b/pkgconf.spec
index f391ace..d837cf3 100644
--- a/pkgconf.spec
+++ b/pkgconf.spec
@@ -1,9 +1,5 @@
-# pkgconf acts as pkgconfig for Fedora and EL8+
-%if (0%{?rhel} && 0%{?rhel} <= 7)
-%bcond_with pkgconfig_compat
-%else
-%bcond_without pkgconfig_compat
-%endif
+# pkgconf acts as pkgconfig
+%bcond pkgconfig_compat 1
 
 %if %{with pkgconfig_compat}
 %global pkgconfig_ver 0.29.1
@@ -13,26 +9,30 @@
 %endif
 
 # Tests are disabled on RHEL 9 because of the extensive dependencies
-%if 0%{?rhel} >= 9
-%bcond_with tests
-%else
-%bcond_without tests
-%endif
+%bcond tests %[%{undefined rhel} || 0%{?rhel} < 9]
 
 # Search path for pc files for pkgconf
+%if 0%{?flatpak_runtime}
+%global pkgconf_libdirs /app/%{_lib}/pkgconfig:/app/share/pkgconfig:/usr/%{_lib}/pkgconfig:/usr/share/pkgconfig
+%else
 %global pkgconf_libdirs %{_libdir}/pkgconfig:%{_datadir}/pkgconfig
+%endif
 
 # libpkgconf soversion major version
-%global libsomajor 4
+%global libsomajor 5
 
 Name:           pkgconf
-Version:        1.9.5
-Release:        2%{?dist}
+Version:        2.3.0
+Release:        3%{?dist}
 Summary:        Package compiler and linker metadata toolkit
 
-License:        ISC
+# cli/getopt_long.c, libpkgconf/bsdstubs.c, libpkgconf/pkg.c and tests/* are ISC
+# cli/getopt_long.c is BSD-4-Clause
+# cli/getopt_long.h is BSD-2-Clause
+# bunch of files are under pkgconf
+# libpkgconf/win-dirent.h is MIT
+License:        ISC AND BSD-4-Clause AND BSD-2-Clause AND pkgconf AND MIT
 URL:            http://pkgconf.org/
-# Mirror at https://releases.pagure.org/pkgconf/pkgconf/
 Source0:        https://distfiles.dereferenced.org/%{name}/%{name}-%{version}.tar.xz
 
 # Simple wrapper scripts to offer platform versions of pkgconfig
@@ -82,7 +82,7 @@ to use functionality provided by %{name}.
 %if %{with pkgconfig_compat}
 %package m4
 Summary:        m4 macros for pkgconf
-License:        GPLv2+ with exceptions
+License:        GPL-2.0-or-later WITH Autoconf-exception-generic
 BuildArch:      noarch
 # Ensure that it Conflicts and Obsoletes pkgconfig since it contains content formerly from it
 Conflicts:      pkgconfig < %{pkgconfig_evr}
@@ -226,6 +226,32 @@ rm -rf %{buildroot}%{_datadir}/aclocal
 
 
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Mon Jan 20 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Wed Aug 07 2024 Neal Gompa <ngompa@fedoraproject.org> - 2.3.0-1
+- Update to 2.3.0
+  + https://github.com/pkgconf/pkgconf/blob/pkgconf-2.3.0/NEWS
+
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue May 14 2024 Jens Petersen <petersen@redhat.com> - 2.1.1-1
+- https://github.com/pkgconf/pkgconf/blob/pkgconf-2.1.1/NEWS
+
+* Mon Feb 12 2024 Jens Petersen <petersen@redhat.com> - 2.1.0-1
+- update to 2.1.0
+- https://github.com/pkgconf/pkgconf/blob/pkgconf-2.1.0/NEWS
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index 1f47994..ede70b3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pkgconf-1.9.5.tar.xz) = 604853d8bb1c3ca14e696f83ac5b161e2592defb921d53e1c16cc949d4b9ecac2b12983c1fbbb3c89898323bda18c8749bff3946e049c8305a1a39a773265f09
+SHA512 (pkgconf-2.3.0.tar.xz) = 869fe0a7a2e06e9da37ff672b991dad60a9a7c9df2c65b78b2aa70dba10920650fb946d5a9c8019ea54a510835acc2eb4244092fa36d0339bd6764ff84e8542c