diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..eb78909
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/results_*
+/+.src.rpm
+
+/jaxb-fi-1.2.18.tar.gz
diff --git a/dead.package b/dead.package
deleted file mode 100644
index 8114387..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-No longer used
diff --git a/jaxb-fi.spec b/jaxb-fi.spec
new file mode 100644
index 0000000..24e154c
--- /dev/null
+++ b/jaxb-fi.spec
@@ -0,0 +1,86 @@
+Name:           jaxb-fi
+Version:        1.2.18
+Release:        4%{?dist}
+Summary:        Implementation of the Fast Infoset Standard for Binary XML
+# jaxb-fi is licensed ASL 2.0 and EDL-1.0 (BSD)
+# bundled org.apache.xerces.util.XMLChar.java is licensed ASL 1.1
+License:        ASL 2.0 and BSD and ASL 1.1
+
+URL:            https://github.com/eclipse-ee4j/jaxb-fi
+Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+
+BuildArch:      noarch
+
+BuildRequires:  maven-local
+BuildRequires:  mvn(com.sun.xml.stream.buffer:streambuffer)
+BuildRequires:  mvn(jakarta.activation:jakarta.activation-api)
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
+BuildRequires:  mvn(org.glassfish.jaxb:xsom)
+
+# package renamed in fedora 33, remove in fedora 35
+Provides:       glassfish-fastinfoset = %{version}-%{release}
+Obsoletes:      glassfish-fastinfoset < 1.2.15-5
+
+# javadoc subpackage is currently not built
+Obsoletes:      glassfish-fastinfoset-javadoc < 1.2.15-5
+
+%description
+Fast Infoset Project, an Open Source implementation of the Fast Infoset
+Standard for Binary XML.
+
+The Fast Infoset specification (ITU-T Rec. X.891 | ISO/IEC 24824-1)
+describes an open, standards-based "binary XML" format that is based on
+the XML Information Set.
+
+
+%prep
+%setup -q
+
+pushd code
+# remove unnecessary dependency on parent POM
+# org.eclipse.ee4j:project is not packaged and not required
+%pom_remove_parent
+
+# disable unnecessary submodules
+%pom_disable_module roundtrip-tests
+%pom_disable_module samples
+
+# disable unnecessary plugins
+%pom_remove_plugin :buildnumber-maven-plugin
+%pom_remove_plugin :glassfish-copyright-maven-plugin
+popd
+
+
+%build
+pushd code
+# skip javadoc build due to https://github.com/fedora-java/xmvn/issues/58
+%mvn_build -f -j -- -DbuildNumber=unknown
+popd
+
+
+%install
+pushd code
+%mvn_install
+popd
+
+
+%files -f code/.mfiles
+%license LICENSE NOTICE.md
+%doc README.md
+
+
+%changelog
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.18-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 04 2021 Dogtag PKI Team <pki-devel@redhat.com> - 1.2.18-3
+- Disable tests
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.18-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Aug 11 2020 Fabio Valentini <decathorpe@gmail.com> - 1.2.18-1
+- Initial package renamed from glassfish-fastinfoset.
+
diff --git a/sources b/sources
new file mode 100644
index 0000000..e87f6dd
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (jaxb-fi-1.2.18.tar.gz) = 2db5c363b7e4166b24e79e4b1b6e9b5b9016dfa62552b3807d9323baa3f6c459a04591c064f7acb4206756ae9f0653a27e926fa887462cd6902b9f989b17656a