diff --git a/.gitmodules b/.gitmodules
index e77adcf..84e7243 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "copr-matrix-synapse"]
 	path = copr-matrix-synapse
-	url = ssh://git@git.a09.uk:48766/alex/copr-matrix-synapse.git
+	url = ssh://git@git.a09.uk:48765/alex/copr-matrix-synapse.git
diff --git a/python-ijson/python-ijson.spec b/archive/python-ijson/python-ijson.spec
similarity index 100%
rename from python-ijson/python-ijson.spec
rename to archive/python-ijson/python-ijson.spec
diff --git a/python-treq/python-treq.spec b/archive/python-treq/python-treq.spec
similarity index 100%
rename from python-treq/python-treq.spec
rename to archive/python-treq/python-treq.spec
diff --git a/copr-matrix-synapse b/copr-matrix-synapse
index c6cb7c1..69bd1e2 160000
--- a/copr-matrix-synapse
+++ b/copr-matrix-synapse
@@ -1 +1 @@
-Subproject commit c6cb7c1d188f34305b7cd2b4d998f72cc0e0255d
+Subproject commit 69bd1e29defa4cda18df1cdbad8d132220e52173
diff --git a/python-matrix-common/python-matrix-common.spec b/python-matrix-common/python-matrix-common.spec
new file mode 100644
index 0000000..68d4604
--- /dev/null
+++ b/python-matrix-common/python-matrix-common.spec
@@ -0,0 +1,59 @@
+# Created by pyp2rpm-3.3.7
+%global pypi_name matrix_common
+%global pypi_version 1.0.0
+
+Name:           python-%{pypi_name}
+Version:        %{pypi_version}
+Release:        1%{?dist}
+Summary:        Common utilities for Synapse, Sydent and Sygnal
+
+License:        None
+URL:            https://github.com/matrix-org/matrix-python-common
+Source0:        %{pypi_name}-%{pypi_version}.tar.gz
+BuildArch:      noarch
+
+BuildRequires:  python3-devel
+BuildRequires:  python3dist(setuptools)
+
+%description
+ matrix-python-commonCommon utilities for Synapse, Sydent and Sygnal.
+Installationshell pip install matrix-common Usageimport matrix_common
+DevelopmentIn a virtual environment with pip ≥ 21.1, runpip install -e .[dev]
+To run the unit tests, you can either use:tox -e pyortrial tests To run the
+linters and mypy type checker, use ./scripts-dev/lint.sh. ReleasingThe exact
+steps for releasing will...
+
+%package -n     python3-%{pypi_name}
+Summary:        %{summary}
+%{?python_provide:%python_provide python3-%{pypi_name}}
+
+Requires:       python3dist(attrs)
+%description -n python3-%{pypi_name}
+ matrix-python-commonCommon utilities for Synapse, Sydent and Sygnal.
+Installationshell pip install matrix-common Usageimport matrix_common
+DevelopmentIn a virtual environment with pip ≥ 21.1, runpip install -e .[dev]
+To run the unit tests, you can either use:tox -e pyortrial tests To run the
+linters and mypy type checker, use ./scripts-dev/lint.sh. ReleasingThe exact
+steps for releasing will...
+
+
+%prep
+%autosetup -n %{pypi_name}-%{pypi_version}
+# Remove bundled egg-info
+rm -rf %{pypi_name}.egg-info
+
+%build
+%py3_build
+
+%install
+%py3_install
+
+%files -n python3-%{pypi_name}
+%license LICENSE
+%doc README.md
+%{python3_sitelib}/%{pypi_name}
+%{python3_sitelib}/%{pypi_name}-%{pypi_version}-py%{python3_version}.egg-info
+
+%changelog
+* Tue Jan 18 2022 Alex Manning <mail@alex-m.co.uk> - 1.0.0-1
+- Initial package.