diff --git a/.fmf/version b/.fmf/version
deleted file mode 100644
index d00491f..0000000
--- a/.fmf/version
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/.gitignore b/.gitignore
index be60b9c..090f4ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1 @@
-/results_*
-/*.src.rpm
-
-/maven-bundle-plugin-2.0.0-project.tar.gz
-/maven-bundle-plugin-2.3.5-source-release.tar.gz
-/maven-bundle-plugin-2.3.6-source-release.tar.gz
-/maven-bundle-plugin-2.3.7-source-release.tar.gz
-/maven-bundle-plugin-2.5.4-source-release.tar.gz
-/maven-bundle-plugin-3.0.1-source-release.tar.gz
-/maven-bundle-plugin-3.2.0-source-release.tar.gz
-/maven-bundle-plugin-3.3.0-source-release.tar.gz
-/maven-bundle-plugin-3.4.0-source-release.tar.gz
-/maven-bundle-plugin-3.5.0-source-release.tar.gz
-/maven-bundle-plugin-3.5.1-source-release.tar.gz
-/maven-bundle-plugin-4.2.0-source-release.tar.gz
-/maven-bundle-plugin-4.2.1-source-release.tar.gz
-/maven-bundle-plugin-5.1.1-source-release.tar.gz
-/maven-bundle-plugin-5.1.9-source-release.tar.gz
+SOURCES/maven-bundle-plugin-5.1.9-source-release.tar.gz
diff --git a/.maven-bundle-plugin.metadata b/.maven-bundle-plugin.metadata
new file mode 100644
index 0000000..1571ce4
--- /dev/null
+++ b/.maven-bundle-plugin.metadata
@@ -0,0 +1 @@
+6852cbe9d382a38d8044dcfe453c5b90d27c855e SOURCES/maven-bundle-plugin-5.1.9-source-release.tar.gz
diff --git a/maven-bundle-plugin.spec b/SPECS/maven-bundle-plugin.spec
similarity index 93%
rename from maven-bundle-plugin.spec
rename to SPECS/maven-bundle-plugin.spec
index 644bb5b..4566f2c 100644
--- a/maven-bundle-plugin.spec
+++ b/SPECS/maven-bundle-plugin.spec
@@ -2,7 +2,7 @@
 
 Name:           maven-bundle-plugin
 Version:        5.1.9
-Release:        8%{?dist}
+Release:        16%{?dist}
 Summary:        Maven Bundle Plugin
 License:        Apache-2.0
 URL:            https://felix.apache.org
@@ -37,11 +37,7 @@ from the contents of the compilation classpath along with its
 resources and dependencies. Plus a zillion other features.
 
 %package javadoc
-Summary:        Javadoc for %{name}
-
-# TODO remove Provides / Obsoletes on maven-plugin-bundle-javadoc in Fedora 41
-Provides:       maven-plugin-bundle-javadoc = %{version}-%{release}
-Obsoletes:      maven-plugin-bundle-javadoc < 5.1.1-9
+Summary:        API documentation for %{name}
 
 %description javadoc
 API documentation for %{name}.
@@ -82,18 +78,23 @@ rm -f src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java
 %license LICENSE NOTICE
 
 %changelog
-* Thu Jan 16 2025 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.1.9-8
-- Update Java compiler target settings
+* Mon Dec 30 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.1.9-15
+- Remove Provides/Obsoletes on maven-plugin-bundle-javadoc
 
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 5.1.9-7
-- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
+* Fri Nov 29 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.1.9-13
+- Update javapackages test plan to f42
 
-* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 5.1.9-6
-- Bump release for Aug 2024 java mass rebuild
+* Fri Aug 23 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.1.9-12
+- Fix Maven compiler target setting
 
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 5.1.9-5
-- Bump release for June 2024 mass rebuild
+* Tue Jul 30 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.1.9-7
+- Drop unneeded Obsoletes
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.9-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 5.1.9-5
+- bump of release for for java-21-openjdk as system jdk
 
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.9-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/ci.fmf b/ci.fmf
deleted file mode 100644
index c5aa0e0..0000000
--- a/ci.fmf
+++ /dev/null
@@ -1 +0,0 @@
-resultsdb-testcase: separate
diff --git a/gating.yaml b/gating.yaml
deleted file mode 100644
index 9512778..0000000
--- a/gating.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-10
-decision_contexts:
-  - osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}
diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
deleted file mode 100644
index f37b73f..0000000
--- a/plans/javapackages.fmf
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: Run javapackages-specific tests
-discover:
-  how: fmf
-  url: https://src.fedoraproject.org/tests/javapackages
-  ref: c10s
-execute:
-  how: tmt
diff --git a/sources b/sources
deleted file mode 100644
index c0c3328..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (maven-bundle-plugin-5.1.9-source-release.tar.gz) = eb1a227101a1c5238680fe31232cea46be5421d8ff2a4b96d7784b829ddef4b579c77eb7302751ab296b7733d9ec1b8f93788bb52113ac796de8b7920dbe6c47