diff --git a/.gitignore b/.gitignore
index e631e0e..bcfcede 100644
--- a/.gitignore
+++ b/.gitignore
@@ -201,3 +201,4 @@ gnome-shell-2.31.5.tar.bz2
 /gnome-shell-42.alpha.tar.xz
 /gnome-shell-42.beta.tar.xz
 /gnome-shell-42.rc.tar.xz
+/gnome-shell-42.0.tar.xz
diff --git a/0001-appDisplay-fix-folder-loop-in-_ensureDefaultFolders.patch b/0001-appDisplay-fix-folder-loop-in-_ensureDefaultFolders.patch
deleted file mode 100644
index 297e0e5..0000000
--- a/0001-appDisplay-fix-folder-loop-in-_ensureDefaultFolders.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From e0aea6d883cbb5bc3a7a81f40fb450171e538676 Mon Sep 17 00:00:00 2001
-From: Adam Williamson <awilliam@redhat.com>
-Date: Wed, 9 Mar 2022 16:12:36 -0800
-Subject: [PATCH 1/2] appDisplay: fix folder loop in `_ensureDefaultFolders`
-
-In testing on Fedora, gnome-shell crashes here:
-
-JS ERROR: TypeError: DEFAULT_FOLDERS[folder] is undefined
-
-This needs to be a "for of" loop, not a "for in" loop, because
-`folders` is an array of the hash's keys, not the hash itself.
-
-Signed-off-by: Adam Williamson <awilliam@redhat.com>
----
- js/ui/appDisplay.js | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
-index d8d0ff4f7..821bfe3b8 100644
---- a/js/ui/appDisplay.js
-+++ b/js/ui/appDisplay.js
-@@ -1467,7 +1467,7 @@ class AppDisplay extends BaseAppView {
-         this._folderSettings.set_strv('folder-children', folders);
- 
-         const { path } = this._folderSettings;
--        for (const folder in folders) {
-+        for (const folder of folders) {
-             const { name, categories, apps } = DEFAULT_FOLDERS[folder];
-             const child = new Gio.Settings({
-                 schema_id: 'org.gnome.desktop.app-folders.folder',
--- 
-2.35.1
-
diff --git a/0002-appDisplay-fix-a-typo-in-the-DEFAULT_FOLDERS-definit.patch b/0002-appDisplay-fix-a-typo-in-the-DEFAULT_FOLDERS-definit.patch
deleted file mode 100644
index b06d1e5..0000000
--- a/0002-appDisplay-fix-a-typo-in-the-DEFAULT_FOLDERS-definit.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 928f6dcdf28510bb60b0da43b511db209b089670 Mon Sep 17 00:00:00 2001
-From: Adam Williamson <awilliam@redhat.com>
-Date: Wed, 9 Mar 2022 18:13:40 -0800
-Subject: [PATCH 2/2] appDisplay: fix a typo in the DEFAULT_FOLDERS definition
-
-This causes a crash because when we look for 'categories' later
-for this entry, it's undefined.
-
-Signed-off-by: Adam Williamson <awilliam@redhat.com>
----
- js/ui/appDisplay.js | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
-index 821bfe3b8..116e9931d 100644
---- a/js/ui/appDisplay.js
-+++ b/js/ui/appDisplay.js
-@@ -79,7 +79,7 @@ const DEFAULT_FOLDERS = {
-     },
-     'YaST': {
-         name: 'suse-yast.directory',
--        categegories: ['X-SuSE-YaST'],
-+        categories: ['X-SuSE-YaST'],
-     },
- };
- 
--- 
-2.35.1
-
diff --git a/gnome-shell.spec b/gnome-shell.spec
index 028ffc5..69ee40a 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -1,8 +1,8 @@
 %global tarball_version %%(echo %{version} | tr '~' '.')
 
 Name:           gnome-shell
-Version:        42~rc
-Release:        2%{?dist}
+Version:        42.0
+Release:        1%{?dist}
 Summary:        Window management and application launching for GNOME
 
 License:        GPLv2+
@@ -19,12 +19,6 @@ Patch40001: 0001-gdm-Work-around-failing-fingerprint-auth.patch
 # Work around crashy tear down
 Patch60003: 0001-main-Leak-the-GJS-context-and-ShellGlobal.patch
 
-# https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2238
-# Fix a couple of bugs that caused gnome-shell to crash on first
-# login with a new user
-Patch80001: 0001-appDisplay-fix-folder-loop-in-_ensureDefaultFolders.patch
-Patch80002: 0002-appDisplay-fix-a-typo-in-the-DEFAULT_FOLDERS-definit.patch
-
 %define eds_version 3.33.1
 %define gnome_desktop_version 3.35.91
 %define glib2_version 2.56.0
@@ -33,7 +27,7 @@ Patch80002: 0002-appDisplay-fix-a-typo-in-the-DEFAULT_FOLDERS-definit.patch
 %define gtk3_version 3.15.0
 %define gtk4_version 4.0.0
 %define adwaita_version 1.0.0
-%define mutter_version 42~rc
+%define mutter_version 42.0
 %define polkit_version 0.100
 %define gsettings_desktop_schemas_version 42~beta
 %define ibus_version 1.5.2
@@ -238,6 +232,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de
 %{_mandir}/man1/gnome-shell.1*
 
 %changelog
+* Sun Mar 13 2022 Florian Müllner <fmuellner@redhat.com> - 42.0-1
+- Update to 42.0
+
 * Wed Mar 09 2022 Adam Williamson <awilliam@redhat.com> - 42~rc-2
 - Backport MR #2238 to fix crashes on first login
 
diff --git a/sources b/sources
index 1fcbc45..e4de46f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-shell-42.rc.tar.xz) = f316153f967b96cf02c298e17f81471bca49f9a77cebfcf65bfeab662849a85c45b457ead70ee06c18154681d22a744d72aff6bcc2d3adbc7d2cfd89b4d54c1a
+SHA512 (gnome-shell-42.0.tar.xz) = 39b56d3c09a238d9ca387145fdbddfaa929b124d4006f097b792de2dceb882e50cbce1255b0b4585aea04b522a92a4e7a743367f43a863f95bb6386401e73935