diff --git a/.gitignore b/.gitignore
index 402b773..836e00a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/osbuild-26.tar.gz
+SOURCES/osbuild-35.tar.gz
diff --git a/.osbuild.metadata b/.osbuild.metadata
index e1a4108..a21aebf 100644
--- a/.osbuild.metadata
+++ b/.osbuild.metadata
@@ -1 +1 @@
-e000ca164a3f216ef99d4be66c0ebb02495d953e SOURCES/osbuild-26.tar.gz
+e7c0228039b6cbab841af199cbe2558254362526 SOURCES/osbuild-35.tar.gz
diff --git a/SPECS/osbuild.spec b/SPECS/osbuild.spec
index 1293e83..ec3c42f 100644
--- a/SPECS/osbuild.spec
+++ b/SPECS/osbuild.spec
@@ -1,7 +1,7 @@
 %global         forgeurl https://github.com/osbuild/osbuild
 %global         selinuxtype targeted
 
-Version:        26
+Version:        35
 
 %forgemeta
 
@@ -56,10 +56,8 @@ Requires:       (%{name}-selinux if selinux-policy-%{selinuxtype})
 # /usr/bin/python3 is present so stages and assemblers can be run.
 %global __brp_mangle_shebangs_exclude_from ^%{pkgdir}/(assemblers|runners|stages)/.*$
 
-
 %{?python_enable_dependency_generator}
 
-
 %description
 A build system for OS images
 
@@ -92,6 +90,14 @@ Contains the necessary SELinux policies that allows
 osbuild to use labels unknown to the host inside the
 containers it uses to build OS artifacts.
 
+%package        tools
+Summary:        Extra tools and utilities
+Requires:       %{name} = %{version}-%{release}
+
+%description    tools
+Contains additional tools and utilities for development of
+manifests and osbuild.
+
 %prep
 %forgesetup
 
@@ -121,15 +127,21 @@ install -p -m 0755 $(find runners -type f -or -type l) %{buildroot}%{pkgdir}/run
 mkdir -p %{buildroot}%{pkgdir}/sources
 install -p -m 0755 $(find sources -type f) %{buildroot}%{pkgdir}/sources
 
+mkdir -p %{buildroot}%{pkgdir}/devices
+install -p -m 0755 $(find devices -type f) %{buildroot}%{pkgdir}/devices
+
 mkdir -p %{buildroot}%{pkgdir}/inputs
 install -p -m 0755 $(find inputs -type f) %{buildroot}%{pkgdir}/inputs
 
+mkdir -p %{buildroot}%{pkgdir}/mounts
+install -p -m 0755 $(find mounts -type f) %{buildroot}%{pkgdir}/mounts
+
 # mount point for bind mounting the osbuild library
 mkdir -p %{buildroot}%{pkgdir}/osbuild
 
 # schemata
 mkdir -p %{buildroot}%{_datadir}/osbuild/schemas
-install -p -m 0755 $(find schemas/*.json) %{buildroot}%{_datadir}/osbuild/schemas
+install -p -m 0644 $(find schemas/*.json) %{buildroot}%{_datadir}/osbuild/schemas
 ln -s %{_datadir}/osbuild/schemas %{buildroot}%{pkgdir}/schemas
 
 # documentation
@@ -139,8 +151,8 @@ install -p -m 0644 -t %{buildroot}%{_mandir}/man1/ docs/*.1
 install -p -m 0644 -t %{buildroot}%{_mandir}/man5/ docs/*.5
 
 # SELinux
-install -D -m 644 -t %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype} %{name}.pp.bz2
-install -D -m 644 -t %{buildroot}%{_mandir}/man8 selinux/%{name}_selinux.8
+install -D -m 0644 -t %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype} %{name}.pp.bz2
+install -D -m 0644 -t %{buildroot}%{_mandir}/man8 selinux/%{name}_selinux.8
 
 %check
 exit 0
@@ -155,9 +167,10 @@ exit 0
 %{_datadir}/osbuild/schemas
 %{pkgdir}
 # the following files are in the ostree sub-package
-%exclude %{pkgdir}/assemblers/org.osbuild.ostree.commit
-%exclude %{pkgdir}/sources/org.osbuild.ostree
-%exclude %{pkgdir}/stages/org.osbuild.ostree
+%exclude %{pkgdir}/assemblers/org.osbuild.ostree*
+%exclude %{pkgdir}/inputs/org.osbuild.ostree*
+%exclude %{pkgdir}/sources/org.osbuild.ostree*
+%exclude %{pkgdir}/stages/org.osbuild.ostree*
 %exclude %{pkgdir}/stages/org.osbuild.rpm-ostree
 
 %files -n       python3-%{pypi_name}
@@ -167,9 +180,10 @@ exit 0
 %{python3_sitelib}/%{pypi_name}/
 
 %files ostree
-%{pkgdir}/assemblers/org.osbuild.ostree.commit
-%{pkgdir}/sources/org.osbuild.ostree
-%{pkgdir}/stages/org.osbuild.ostree
+%{pkgdir}/assemblers/org.osbuild.ostree*
+%{pkgdir}/inputs/org.osbuild.ostree*
+%{pkgdir}/sources/org.osbuild.ostree*
+%{pkgdir}/stages/org.osbuild.ostree*
 %{pkgdir}/stages/org.osbuild.rpm-ostree
 
 %files selinux
@@ -188,8 +202,34 @@ fi
 %posttrans selinux
 %selinux_relabel_post -s %{selinuxtype}
 
+%files tools
+%{_bindir}/osbuild-mpp
 
 %changelog
+* Sun Aug 29 2021 Tom Gundersen <teg@jklm.no> - 35-1
+- Upstream release 35
+
+* Sun Aug 29 2021 Tom Gundersen <teg@jklm.no> - 34-1
+- Upstream release 34
+
+* Wed Aug 25 2021 Tom Gundersen <teg@jklm.no> - 33-1
+- Upstream release 33
+
+* Tue Aug 24 2021 Tom Gundersen <teg@jklm.no> - 32-1
+- Upstream release 32
+
+* Mon Aug 23 2021 Tom Gundersen <teg@jklm.no> - 31-1
+- Upstream release 31
+
+* Fri Jul 23 2021 Christian Kellner <christian@kellner.me> - 30-1
+- Upstream release 30
+- Ship osbuild-mpp in new tools sub-package.
+- Remove executable bit from schemata files.
+
+* Tue Apr 27 2021 Achilleas Koutsou <achilleas@redhat.com> - 28-1
+- Upstream release 28
+- Includes fixes and feature additions for multiple stages.
+
 * Fri Feb 19 2021 Christian Kellner <ckellner@redhat.com> - 26-1
 - Upstream release 26
 - Includes the necessary stages to build boot isos.