diff --git a/.gitignore b/.gitignore
index 53c4dc7..17dc313 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/inih-r49.tar.gz
+inih-r58.tar.gz
diff --git a/.inih.metadata b/.inih.metadata
deleted file mode 100644
index 212c365..0000000
--- a/.inih.metadata
+++ /dev/null
@@ -1 +0,0 @@
-97b3736e9aee21d2cc78383f933530d2e0716d33 SOURCES/inih-r49.tar.gz
diff --git a/SPECS/inih.spec b/inih.spec
similarity index 57%
rename from SPECS/inih.spec
rename to inih.spec
index 4cf4f1c..13d5607 100644
--- a/SPECS/inih.spec
+++ b/inih.spec
@@ -1,14 +1,14 @@
 Name:     inih
-Version:  49
-Release:  6%{?dist}
+Version:  58
+Release:  3%{?dist}
 Summary:  Simple INI file parser library
 
-License:  BSD
+License:  BSD-3-Clause
 URL:      https://github.com/benhoyt/inih
 Source0:  %{url}/archive/r%{version}/%{name}-r%{version}.tar.gz
 
 BuildRequires: gcc
-BuildRequires: g++
+BuildRequires: gcc-c++
 BuildRequires: meson
 
 
@@ -17,11 +17,18 @@ The inih package provides simple INI file parser which is only a couple of
 pages of code, and it was designed to be small and simple, so it's good for
 embedded systems.
 
+%package cpp
+Summary: INIReader C++ library
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description cpp
+This package contains the INIReader C++ library which provides a C++ interface
+for inih.
 
 %package devel
 Summary:  Development package for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
-
+Requires: %{name}-cpp%{?_isa} = %{version}-%{release}
 
 %description devel
 This package contains development files for %{name}.
@@ -36,7 +43,7 @@ embedded systems.
 
 
 %build
-%meson -Ddefault_library=shared -Ddistro_install=true
+%meson
 %meson_build
 
 
@@ -44,29 +51,71 @@ embedded systems.
 %meson_install
 
 
+%ldconfig_scriptlets
+
+
 %files
 %license LICENSE.txt
 %doc README.md
-%{_libdir}/lib%{name}.so.%{version}
 %{_libdir}/lib%{name}.so.0
 
+%files cpp
+%{_libdir}/libINIReader.so.0
+
 
 %files devel
 %{_includedir}/ini.h
+%{_includedir}/INIReader.h
 %{_libdir}/pkgconfig/inih.pc
+%{_libdir}/pkgconfig/INIReader.pc
 %{_libdir}/lib%{name}.so
+%{_libdir}/libINIReader.so
 
 
 %changelog
-* Fri Jun 10 2022 Eric Sandeen <sandeen@redhat.com> - 49-6
-- Release bump, no changes
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 58-3
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 49-5
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 58-2
+- Bump release for June 2024 mass rebuild
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 49-4
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Sat Jan 27 2024 Robert Scheck <robert@fedoraproejct.org> - 58-1
+- New upstream release 58 (#2260272)
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 57-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 57-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Dec  2 2023 Daan De Meyer <daan.j.demeyer@gmail.com> - 57-3
+- Move INIReader C++ library to inih-cpp subpackage
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 57-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jul 07 2023 Robert Scheck <robert@fedoraproejct.org> - 57-1
+- New upstream release 57 (#2221191)
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 56-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 56-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jul 13 2022 Robert Scheck <robert@fedoraproejct.org> - 56-1
+- New upstream release 56 (#2106574)
+
+* Sat Apr 23 2022 Robert Scheck <robert@fedoraproejct.org> - 55-1
+- New upstream release 55 (#1920254)
+- Re-add ldconfig scriptlets for EPEL 7 (#2066538)
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 49-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 49-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 49-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
new file mode 100644
index 0000000..8ac3282
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (inih-r58.tar.gz) = d69f488299c1896e87ddd3dd20cd9db5848da7afa4c6159b8a99ba9a5d33f35cadfdb9f65d6f2fe31decdbadb8b43bf610ff2699df475e1f9ff045e343ac26ae