diff --git a/changelog b/changelog
new file mode 100644
index 0000000..ed2b8d5
--- /dev/null
+++ b/changelog
@@ -0,0 +1,12 @@
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2022.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2022.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2022.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Aug 07 2023 Marian Koncek <mkoncek@redhat.com> - 2022.7-1
+- Package unretired
+- Update to upstream version 2022.7
diff --git a/msv.spec b/msv.spec
index 576257b..ff1ec35 100644
--- a/msv.spec
+++ b/msv.spec
@@ -1,6 +1,6 @@
 Name:           msv
 Version:        2022.7
-Release:        3%{?dist}
+Release:        %autorelease
 Summary:        Multi-Schema Validator Toolkit
 # License breakdown
 # Apache-1.1
@@ -20,17 +20,18 @@ ExclusiveArch:  %{java_arches} noarch
 
 # ./generate-tarball.sh
 Source0:        %{name}-%{version}.tar.gz
-
 Source1:        generate-tarball.sh
 
-Patch1:         0001-Disable-Apache-XercesImpl.patch
+Patch:          0001-Disable-Apache-XercesImpl.patch
 
-BuildRequires:  maven-local
+BuildRequires:  maven-local-openjdk25
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-assembly-plugin)
 BuildRequires:  mvn(org.jdom:jdom2)
 BuildRequires:  mvn(relaxngDatatype:relaxngDatatype)
+# TODO Remove in Fedora 46
+Obsoletes:      %{name}-javadoc < 2022.7-15
 
 %description
 The Multi Schema Validation toolkit is a Java based toolkit consisting of 8
@@ -39,24 +40,17 @@ for the validation of XML documents against several kinds of XML schemata The
 core supports RELAX NG, RELAX Namespace, RELAX Core, TREX, XML DTDs, and a
 subset of XML Schema Part 1.
 
-%package        javadoc
-Summary:        API documentation for %{name}
-
-%description    javadoc
-This package provides %{summary}.
-
-%package        xsdlib
+%package xsdlib
 Summary:        Java implementation of W3C’s XML Schema Part 2
 
-%description    xsdlib
+%description xsdlib
 MSV XML Datatypes Library, Java implementation of W3C’s XML Schema Part 2, is
 intended for use with applications that incorporate XML Schema Part 2.
 
 %prep
-%setup -q
+%autosetup -p1 -C
 
 # Disable runtime dependency on Apache Xerces
-%patch 1 -p1
 rm xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/XercesImpl.java
 
 %pom_xpath_remove 'pom:project/pom:modules'
@@ -74,25 +68,14 @@ rm xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/XercesImpl.java
 %mvn_package net.java.dev.msv:msv __noinstall
 
 %build
-%mvn_build -s
+%mvn_build -j -s
 
 %install
 %mvn_install
 
-%files javadoc -f .mfiles-javadoc
-%license Apache-LICENSE-1.1.txt license.txt
-
 %files xsdlib -f .mfiles-xsdlib
 %doc README.md README-xsdlib.md
 %license Apache-LICENSE-1.1.txt license.txt
 
 %changelog
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2022.7-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2022.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Aug 07 2023 Marian Koncek <mkoncek@redhat.com> - 2022.7-1
-- Package unretired
-- Update to upstream version 2022.7
+%autochangelog
diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
index a2cdaba..ae17c0c 100644
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@@ -1,7 +1,7 @@
 summary: Run javapackages-specific tests
 discover:
   how: fmf
-  url: https://src.fedoraproject.org/tests/javapackages
-  ref: f40
+  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
+  ref: f43
 execute:
   how: tmt