diff --git a/xbiso-c23.patch b/xbiso-c23.patch
deleted file mode 100644
index c378ea1..0000000
--- a/xbiso-c23.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up xbiso-0.6.1/xbiso.c.c23 xbiso-0.6.1/xbiso.c
---- xbiso-0.6.1/xbiso.c.c23	2025-02-24 16:53:04.512018181 -0500
-+++ xbiso-0.6.1/xbiso.c	2025-02-24 16:56:34.622066472 -0500
-@@ -116,8 +116,8 @@ int main(int argc, char *argv[]) {
-   xbfseek = fseeko;
-   xbftell = ftello;
- #else
--  int (*xbfseek)();
--  OFFT (*xbftell)();
-+  int (*xbfseek)(FILE *, __off64_t, int);
-+  OFFT (*xbftell)(FILE *);
-   xbfseek = fseeko64;
-   xbftell = ftello64;
- #endif
-@@ -285,8 +285,8 @@ handlefile(OFFT offset, int dtable) {
-   xbfseek = fseeko;
-   xbftell = ftello;
- #else
--  int (*xbfseek)();
--  OFFT (*xbftell)();
-+  int (*xbfseek)(FILE *, __off64_t, int);
-+  OFFT (*xbftell)(FILE *);
-   xbfseek = fseeko64;
-   xbftell = ftello64;
- #endif
-@@ -455,8 +455,8 @@ void extract(TABLE *dirent) {
-   xbfseek = fseeko;
-   xbftell = ftello;
- #else
--  int (*xbfseek)();
--  off64_t (*xbftell)();
-+  int (*xbfseek)(FILE *, __off64_t, int);
-+  off64_t (*xbftell)(FILE *);
-   xbfseek = fseeko64;
-   xbftell = ftello64;
- 
diff --git a/xbiso.spec b/xbiso.spec
index 86087b8..7f506d8 100644
--- a/xbiso.spec
+++ b/xbiso.spec
@@ -1,16 +1,14 @@
 Name:		xbiso
 Version:	0.6.1
-Release:	39%{?dist}
+Release:	31%{?dist}
 Summary:	ISO extraction utility for xdvdfs images
-# Automatically converted from old format: GPLv2+ - review is highly recommended.
-License:	GPL-2.0-or-later
+License:	GPLv2+
 URL:		http://sourceforge.net/projects/xbiso/
 Source0:	http://downloads.sourceforge.net/xbiso/%{name}-%{version}.tar.gz
 Patch0:		xbiso-0.6.1-destdir.patch
 Patch1:		xbiso-0.6.1-ftplib4.patch
 Patch2:		xbiso-configure-c99.patch
 Patch3:		xbiso-c99.patch
-Patch4:		xbiso-c23.patch
 BuildRequires: make
 BuildRequires:  gcc
 BuildRequires:	ftplib-devel
@@ -20,11 +18,10 @@ xbiso is an ISO extraction utility for xdvdfs images.
 
 %prep
 %setup -q
-%patch -P0 -p1
-%patch -P1 -p1 -b .ftplib4
-%patch -P2 -p1
-%patch -P3 -p1
-%patch -P4 -p1
+%patch0 -p1
+%patch1 -p1 -b .ftplib4
+%patch2 -p1
+%patch3 -p1
 
 %build
 %configure
@@ -41,30 +38,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
 %{_bindir}/xbiso
 
 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-39
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-38
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-37
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Mon Feb 24 2025 Tom Callaway <spot@fedoraproject.org> - 0.6.1-36
-- fix empty function declarations to fix compile against C23 (gcc15)
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-35
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 0.6.1-34
-- convert license to SPDX
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-33
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-32
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
 * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-31
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild