diff --git a/.gitignore b/.gitignore
index bd631cf..f41a3b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/librepo-1.18.0.tar.gz
+librepo-1.18.0.tar.gz
diff --git a/.librepo.metadata b/.librepo.metadata
deleted file mode 100644
index dd6d26e..0000000
--- a/.librepo.metadata
+++ /dev/null
@@ -1 +0,0 @@
-93b90217a5baf96ba1232cced6189ba0df5798f5 SOURCES/librepo-1.18.0.tar.gz
diff --git a/SOURCES/0001-Use-rpm-sequoia-on-RHEL-10.patch b/0001-Use-rpm-sequoia-on-RHEL-10.patch
similarity index 100%
rename from SOURCES/0001-Use-rpm-sequoia-on-RHEL-10.patch
rename to 0001-Use-rpm-sequoia-on-RHEL-10.patch
diff --git a/SOURCES/0002-Fix-a-memory-leak-in-select_next_target.patch b/0002-Fix-a-memory-leak-in-select_next_target.patch
similarity index 100%
rename from SOURCES/0002-Fix-a-memory-leak-in-select_next_target.patch
rename to 0002-Fix-a-memory-leak-in-select_next_target.patch
diff --git a/SOURCES/0004-Fix-input-termination-for-pgpParsePkts.patch b/0003-Fix-input-termination-for-pgpParsePkts.patch
similarity index 100%
rename from SOURCES/0004-Fix-input-termination-for-pgpParsePkts.patch
rename to 0003-Fix-input-termination-for-pgpParsePkts.patch
diff --git a/SOURCES/0005-Test-importing-keys-with-prefix-and-suffix.patch b/0004-Test-importing-keys-with-prefix-and-suffix.patch
similarity index 100%
rename from SOURCES/0005-Test-importing-keys-with-prefix-and-suffix.patch
rename to 0004-Test-importing-keys-with-prefix-and-suffix.patch
diff --git a/SOURCES/0003-Propagate-return-value-from-prepare_repo_download_ta.patch b/0005-Propagate-return-value-from-prepare_repo_download.patch
similarity index 100%
rename from SOURCES/0003-Propagate-return-value-from-prepare_repo_download_ta.patch
rename to 0005-Propagate-return-value-from-prepare_repo_download.patch
diff --git a/SPECS/librepo.spec b/librepo.spec
similarity index 97%
rename from SPECS/librepo.spec
rename to librepo.spec
index 375fa3b..9b1019b 100644
--- a/SPECS/librepo.spec
+++ b/librepo.spec
@@ -37,10 +37,10 @@ URL:            https://github.com/rpm-software-management/librepo
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 Patch1:         0001-Use-rpm-sequoia-on-RHEL-10.patch
 Patch2:         0002-Fix-a-memory-leak-in-select_next_target.patch
-Patch3:         0003-Propagate-return-value-from-prepare_repo_download_ta.patch
 # https://github.com/rpm-software-management/librepo/pull/325
-Patch4:         0004-Fix-input-termination-for-pgpParsePkts.patch
-Patch5:         0005-Test-importing-keys-with-prefix-and-suffix.patch
+Patch3:         0003-Fix-input-termination-for-pgpParsePkts.patch
+Patch4:         0004-Test-importing-keys-with-prefix-and-suffix.patch
+Patch5:         0005-Propagate-return-value-from-prepare_repo_download.patch
 
 BuildRequires:  cmake
 BuildRequires:  gcc
@@ -133,15 +133,14 @@ Python 3 bindings for the librepo library.
 %{python3_sitearch}/%{name}/
 
 %changelog
-* Thu Jul 03 2025 Ales Matej <amatej@redhat.com> - 1.18.0-6
-- Test for: Fix input termination for pgpParsePkts (RHEL-61730)
+* Wed Sep 24 2025 Ales Matej <amatej@redhat.com> - 1.18.0-6
+- Propagate return value from prepare_repo_download_targets (RHEL-101181)
 
-* Tue Jun 24 2025 Romain Geissler <romain.geissler@amadeus.com> - 1.18.0-5
-- Fix input termination for pgpParsePkts
-  Resolves: RHEL-82533
+* Thu Jul 03 2025 Ales Matej <amatej@redhat.com> - 1.18.0-5
+- Test for: Fix input termination for pgpParsePkts (RHEL-101176)
 
-* Tue Jun 24 2025 Ales Matej <amatej@redhat.com> - 1.18.0-4
-- Propagate return value from prepare_repo_download_targets (RHEL-85338)
+* Tue Jun 24 2025 Romain Geissler <romain.geissler@amadeus.com> - 1.18.0-4
+- Fix input termination for pgpParsePkts (RHEL-101176)
 
 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.18.0-3
 - Bump release for October 2024 mass rebuild:
diff --git a/sources b/sources
new file mode 100644
index 0000000..4ecab35
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (librepo-1.18.0.tar.gz) = 6630b4751163ff6a34c32b94f6d0ecdc34926ade6aa92342c99eef9a514edd25405e051c58f6630615dd9cd04ef5c0404ebc4805708356477b97d351baa19a73