diff --git a/.cockpit-appstream.metadata b/.cockpit-appstream.metadata
index b19f295..907fc6a 100644
--- a/.cockpit-appstream.metadata
+++ b/.cockpit-appstream.metadata
@@ -1 +1 @@
-b1021f0ad164c792509c8a650db486e97af84e68 SOURCES/cockpit-236.tar.xz
+b58f59c33ec5168148d725bb80b66cbdb7cb5496 SOURCES/cockpit-237.tar.xz
diff --git a/.gitignore b/.gitignore
index 318654b..ba8ad88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/cockpit-236.tar.xz
+SOURCES/cockpit-237.tar.xz
diff --git a/SPECS/cockpit-appstream.spec b/SPECS/cockpit-appstream.spec
index 05da3a5..a9eb0a0 100644
--- a/SPECS/cockpit-appstream.spec
+++ b/SPECS/cockpit-appstream.spec
@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:        236
+Version:        237
 Release: 1%{?dist}
 #
 # Copyright (C) 2014-2020 Red Hat, Inc.
@@ -66,10 +66,11 @@ Source0:        cockpit-%{version}.tar.gz
 Source0:        https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz
 %endif
 
-# in RHEL the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system})
+# in RHEL 8 the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system})
 # and cockpit-appstream (building optional packages like cockpit-{machines,pcp})
 # This split does not apply to EPEL/COPR.
-%if 0%{?rhel} && 0%{?epel} == 0
+# In Fedora ELN/RHEL 9+ there is just one source package, which ships rpms in both BaseOS and AppStream
+%if 0%{?rhel} == 8 && 0%{?epel} == 0
 
 %if "%{name}" == "cockpit"
 %define build_basic 1
@@ -413,6 +414,7 @@ Provides: cockpit-shell = %{version}-%{release}
 Provides: cockpit-systemd = %{version}-%{release}
 Provides: cockpit-tuned = %{version}-%{release}
 Provides: cockpit-users = %{version}-%{release}
+Obsoletes: cockpit-dashboard
 %if 0%{?rhel}
 Provides: cockpit-networkmanager = %{version}-%{release}
 Obsoletes: cockpit-networkmanager
@@ -426,7 +428,6 @@ Recommends: setroubleshoot-server >= 3.3.3
 Provides: cockpit-selinux = %{version}-%{release}
 Provides: cockpit-sosreport = %{version}-%{release}
 Requires: sos
-Obsoletes: cockpit-dashboard
 %endif
 %if 0%{?fedora} >= 29
 # 0.7.0 (actually) supports task cancellation.
@@ -697,6 +698,14 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Thu Feb 04 2021 Katerina Koukiou <kkoukiou@redhat.com> - 237-1
+- machines: Fix virt-viewer file download on chromium based Edge (rhbz#1730666)
+- machines: Fix crash when a target is pasted in the VM creation dialog (rhbz#1872660)
+- machines: Fix alert about pending changes in NIC edit dialog (rhbz#1911657)
+- machines: Fix alert about pending changes in overview card related to boot order (rhbz#1915765)
+- machines: Fix file autocomplete select not closing on enter (rhbz#1874392)
+- machines: Fix white screen when deleting a VM in an environment without storage pools (rhbz#1912384)
+
 * Fri Jan 22 2021 Martin Pitt <mpitt@redhat.com> - 236-1
 - machines: Fix unstable VNC console (rhbz#1750642)
 - machines: Fix alert close property in the VM details (rhbz#1918147)