diff --git a/0001-runners-add-Fedora-36-runner.patch b/0001-runners-add-Fedora-36-runner.patch
new file mode 100644
index 0000000..7442a75
--- /dev/null
+++ b/0001-runners-add-Fedora-36-runner.patch
@@ -0,0 +1,23 @@
+From e8c219036302817882d469400b08cbac4b93a781 Mon Sep 17 00:00:00 2001
+From: Christian Kellner <christian@kellner.me>
+Date: Fri, 20 Aug 2021 14:18:28 +0200
+Subject: [PATCH 1/3]  runners: add Fedora 36 runner
+
+New `org.osbuild.fedora36` which is re-using the f30 runner.
+Needed since Fedora 36 was branched already.
+---
+ runners/org.osbuild.fedora36 | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 120000 runners/org.osbuild.fedora36
+
+diff --git a/runners/org.osbuild.fedora36 b/runners/org.osbuild.fedora36
+new file mode 120000
+index 0000000..d46777b
+--- /dev/null
++++ b/runners/org.osbuild.fedora36
+@@ -0,0 +1 @@
++org.osbuild.fedora30
+\ No newline at end of file
+-- 
+2.21.1 (Apple Git-122.3)
+
diff --git a/osbuild.spec b/osbuild.spec
index 3b96fa6..fa03781 100644
--- a/osbuild.spec
+++ b/osbuild.spec
@@ -9,12 +9,13 @@ Version:        31
 %global         pkgdir %{_prefix}/lib/%{pypi_name}
 
 Name:           %{pypi_name}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        ASL 2.0
 
 URL:            %{forgeurl}
 
 Source0:        %{forgesource}
+Patch0:         0001-runners-add-Fedora-36-runner.patch
 BuildArch:      noarch
 Summary:        A build system for OS images
 
@@ -100,6 +101,7 @@ manifests and osbuild.
 
 %prep
 %forgesetup
+%patch0 -p1
 
 %build
 %py3_build
@@ -207,6 +209,9 @@ fi
 
 
 %changelog
+* Mon Aug 23 2021 Martin Sehnoutka <msehnout@redhat.com> - 31-2
+- Include runner for Fedora 36
+
 * Fri Aug 20 2021 Martin Sehnoutka <msehnout@redhat.com> - 31-1
 - New upstream release