diff --git a/0001-fedora.yaml-Drop-armhfp-arch.patch b/0001-fedora.yaml-Drop-armhfp-arch.patch
new file mode 100644
index 0000000..05e1e2f
--- /dev/null
+++ b/0001-fedora.yaml-Drop-armhfp-arch.patch
@@ -0,0 +1,25 @@
+From 881bcadaf0c156a7ef344a116b96ae942558774d Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember@redhat.com>
+Date: Mon, 5 Sep 2022 07:19:37 +0200
+Subject: [PATCH 1/2] fedora.yaml: Drop armhfp arch
+
+armv7hl architecture is disabled in koji in F37+.
+---
+ config/fedora.yaml | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/config/fedora.yaml b/config/fedora.yaml
+index 63b0c3f..d94519c 100644
+--- a/config/fedora.yaml
++++ b/config/fedora.yaml
+@@ -10,7 +10,6 @@ data:
+                 dataset-regex: f(?P<releasever>[0-9]+)
+                 architectures:
+                     - aarch64
+-                    - armhfp
+                     - x86_64
+                 platform-module:
+                     stream-template: f{releasever}
+-- 
+2.38.1
+
diff --git a/0002-Update-the-dataset-for-Fedora-37.patch b/0002-Update-the-dataset-for-Fedora-37.patch
new file mode 100644
index 0000000..438bb12
--- /dev/null
+++ b/0002-Update-the-dataset-for-Fedora-37.patch
@@ -0,0 +1,40 @@
+From 735e7dd8d4ecf127565c49cff2da9a115622b48b Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember@redhat.com>
+Date: Mon, 21 Nov 2022 16:12:03 +0100
+Subject: [PATCH 2/2] Update the dataset for Fedora 37
+
+---
+ config/fedora.yaml | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/config/fedora.yaml b/config/fedora.yaml
+index d94519c..d5b1d6c 100644
+--- a/config/fedora.yaml
++++ b/config/fedora.yaml
+@@ -2,7 +2,7 @@ document: fedmod-configuration
+ version: 1
+ data:
+     options:
+-        dataset: f36
++        dataset: f37
+     datasets:
+         templates:
+             fedora-base:
+@@ -73,11 +73,13 @@ data:
+                 template: fedora-stable
+             f36:
+                 template: fedora-stable
++            f37:
++                template: fedora-stable
+             rawhide:
+                 dataset-regex: rawhide
+                 platform-module:
+                     # nothing to match -> hardcode
+-                    stream-template: f37
++                    stream-template: f38
+                 template: fedora-base
+                 repositories:
+                     fedora:
+-- 
+2.38.1
+
diff --git a/fedmod.spec b/fedmod.spec
index da81f7f..e27cca8 100644
--- a/fedmod.spec
+++ b/fedmod.spec
@@ -2,13 +2,16 @@
 
 Name:           fedmod
 Version:        0.6.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Utilities for generating & maintaining modulemd files
 
 License:        GPLv2+ and GPLv3+ and MIT
 URL:            https://pagure.io/modularity/fedmod
 Source0:        https://pagure.io/modularity/fedmod/archive/%{name}-%{version}-1/%{name}-%{version}.tar.gz
 
+Patch:          0001-fedora.yaml-Drop-armhfp-arch.patch
+Patch:          0002-Update-the-dataset-for-Fedora-37.patch
+
 BuildArch:      noarch
 
 BuildRequires:  python3-aiohttp
@@ -76,6 +79,10 @@ fi
 %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info
 
 %changelog
+* Mon Nov 21 2022 Kalev Lember <klember@redhat.com> - 0.6.5-5
+- Update the dataset for Fedora 37
+- fedora.yaml: Drop armhfp arch
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild