diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8e39688
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+msv-20050722.tar.gz
+/msv-2009.1.tar.gz
+/msv-2013.2.3.tar.gz
+/msv-parent-2009.1.pom
+/LICENSE-2.0.txt
+/msv-2013.5.1-clean.tar.gz
+/msv-2013.6.1-clean.tar.gz
+/msv-2022.7.tar.gz
diff --git a/0001-Disable-Apache-XercesImpl.patch b/0001-Disable-Apache-XercesImpl.patch
new file mode 100644
index 0000000..0f8f777
--- /dev/null
+++ b/0001-Disable-Apache-XercesImpl.patch
@@ -0,0 +1,24 @@
+From a580f124197fcc2a62875e43100cd35b1fc4329e Mon Sep 17 00:00:00 2001
+From: Marian Koncek <mkoncek@redhat.com>
+Date: Thu, 17 Aug 2023 09:30:08 +0200
+Subject: [PATCH] Disable Apache XercesImpl
+
+---
+ .../main/java/com/sun/msv/datatype/xsd/regex/RegExpFactory.java  | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/RegExpFactory.java b/xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/RegExpFactory.java
+index 4a4c4be..cdeab93 100644
+--- a/xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/RegExpFactory.java
++++ b/xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/RegExpFactory.java
+@@ -42,7 +42,6 @@ public abstract class RegExpFactory {
+     public static RegExpFactory createFactory() {
+         String[] classList = new String[] {
+             "com.sun.msv.datatype.regexp.InternalImpl",
+-            "com.sun.msv.datatype.xsd.regex.XercesImpl",
+             "com.sun.msv.datatype.xsd.regex.JDKImpl"
+         };
+ 
+-- 
+2.41.0
+
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/ci.fmf b/ci.fmf
new file mode 100644
index 0000000..c5aa0e0
--- /dev/null
+++ b/ci.fmf
@@ -0,0 +1 @@
+resultsdb-testcase: separate
diff --git a/dead.package b/dead.package
deleted file mode 100644
index 161cbda..0000000
--- a/dead.package
+++ /dev/null
@@ -1,3 +0,0 @@
-2016-10-19: Retired orphaned package, because it was orphaned for
-more than six weeks.
-
diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..0d484d7
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,8 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_contexts:
+  - bodhi_update_push_testing
+  - bodhi_update_push_stable
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional}
diff --git a/generate-tarball.sh b/generate-tarball.sh
new file mode 100755
index 0000000..fe7bf22
--- /dev/null
+++ b/generate-tarball.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+set -e
+
+name=msv
+version="$(sed -n 's/Version:\s*//p' ./*.spec)"
+
+# RETRIEVE
+wget "https://github.com/xmlark/msv/archive/${name}-${version}/${name}-${version}.tar.gz" -O "${name}-${version}.orig.tar.gz"
+
+rm -rf tarball-tmp
+mkdir tarball-tmp
+pushd tarball-tmp
+tar -xf "../${name}-${version}.orig.tar.gz"
+mv "msv-msv-${version}" "${name}-${version}"
+
+pushd "${name}-${version}"
+mv docs/xsdlib/Apache-LICENSE-1.1.txt .
+mv docs/xsdlib/license.txt .
+mv docs/xsdlib/README.md README-xsdlib.md
+
+# CLEAN TARBALL
+find . -mindepth 1 -maxdepth 1 -type d ! -name 'xsdlib' -exec rm -rf {} +
+rm -rf xsdlib/src/test
+
+popd
+
+tar -czf "../${name}-${version}.tar.gz" ./*
+popd
+rm -r tarball-tmp "${name}-${version}.orig.tar.gz"
diff --git a/msv.spec b/msv.spec
new file mode 100644
index 0000000..ff1ec35
--- /dev/null
+++ b/msv.spec
@@ -0,0 +1,81 @@
+Name:           msv
+Version:        2022.7
+Release:        %autorelease
+Summary:        Multi-Schema Validator Toolkit
+# License breakdown
+# Apache-1.1
+# * xsdlib/src/main/java/com/sun/msv/datatype/regexp - All files except for InternalImpl.java
+# BSD-3-Clause-Sun
+# * pom.xml
+# * xsdlib/src/main/java/com/sun/msv/datatype/regexp/InternalImpl.java
+# BSD-3-Clause-Sun implied by docs/xsdlib/license.txt of the original tarball
+# * xsdlib/src/main/java/com/sun/msv/datatype/xsd/CommandLineTester.java
+# * xsdlib/src/main/resources/com/sun/msv/datatype/xsd/Messages.properties
+# * xsdlib/src/main/resources/com/sun/msv/datatype/xsd/Messages_ja.properties
+# BSD-3-Clause - All other .java files
+License:        Apache-1.1 AND BSD-3-Clause AND BSD-3-Clause-Sun
+URL:            https://xmlark.github.io/msv/
+BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
+
+# ./generate-tarball.sh
+Source0:        %{name}-%{version}.tar.gz
+Source1:        generate-tarball.sh
+
+Patch:          0001-Disable-Apache-XercesImpl.patch
+
+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
+different submodules. The core module is the Multi-Schema XML Validator (MSV)
+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 xsdlib
+Summary:        Java implementation of W3C’s XML Schema Part 2
+
+%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
+%autosetup -p1 -C
+
+# Disable runtime dependency on Apache Xerces
+rm xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/XercesImpl.java
+
+%pom_xpath_remove 'pom:project/pom:modules'
+%pom_xpath_inject 'pom:project' '<modules><module>xsdlib</module></modules>'
+
+%pom_xpath_remove 'pom:build/pom:extensions'
+
+%pom_remove_dep org.apache.maven.scm:maven-scm-provider-gitexe
+%pom_remove_dep xerces:xercesImpl xsdlib
+
+%pom_remove_plugin org.codehaus.mojo:flatten-maven-plugin
+%pom_remove_plugin -r :maven-javadoc-plugin
+
+# We only build xsdlib
+%mvn_package net.java.dev.msv:msv __noinstall
+
+%build
+%mvn_build -j -s
+
+%install
+%mvn_install
+
+%files xsdlib -f .mfiles-xsdlib
+%doc README.md README-xsdlib.md
+%license Apache-LICENSE-1.1.txt license.txt
+
+%changelog
+%autochangelog
diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
new file mode 100644
index 0000000..ae17c0c
--- /dev/null
+++ b/plans/javapackages.fmf
@@ -0,0 +1,7 @@
+summary: Run javapackages-specific tests
+discover:
+  how: fmf
+  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
+  ref: f43
+execute:
+  how: tmt
diff --git a/sources b/sources
new file mode 100644
index 0000000..386f1d9
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (msv-2022.7.tar.gz) = 1fb7600af4a589bb68687b17fd7da3bd370362e06450d81509eb343f87a85366d3843f2b42f566560637428fdc8dc4abbd2eb5bc81444ab58ebf48c16d4d353e