diff --git a/0001_fix_rare_crash_git_2609548e_and_9ed4c438.patch b/0001_fix_rare_crash_git_2609548e_and_9ed4c438.patch
new file mode 100644
index 0000000..8fa2598
--- /dev/null
+++ b/0001_fix_rare_crash_git_2609548e_and_9ed4c438.patch
@@ -0,0 +1,39 @@
+diff --git a/src/rcw.c b/src/rcw.c
+index 0c3e591b045d2d06aa1aee1559041aa80edc2542..b750a16cb5d1387b61b1f14be325487f62e45b8a 100644
+--- a/src/rcw.c
++++ b/src/rcw.c
+@@ -3399,6 +3399,7 @@ void rco_closewin(RemminaProtocolWidget *gp)
+ 	if (cnnobj) {
+ 		cnnobj->remmina_file = NULL;
+ 		g_free(cnnobj);
++		gp->cnnobj = NULL;
+ 	}
+ 
+ 	remmina_application_condexit(REMMINA_CONDEXIT_ONDISCONNECT);
+diff --git a/src/remmina_protocol_widget.c b/src/remmina_protocol_widget.c
+index 7a7fbc44b2a28f5fe18f7409de2772234e17104a..307342009f493787d44f9b5cc34060ac7de4cb1d 100644
+--- a/src/remmina_protocol_widget.c
++++ b/src/remmina_protocol_widget.c
+@@ -1519,6 +1519,9 @@ static gboolean remmina_protocol_widget_dialog_mt_setup(gpointer user_data)
+ 	RemminaMessagePanel *mp;
+ 	const gchar *s;
+ 
++	if (d->gp->cnnobj == NULL)
++		return;
++
+ 	mp = remmina_message_panel_new();
+ 
+ 	if (d->dtype == RPWDT_AUTH) {
+diff --git a/src/remmina_protocol_widget.c b/src/remmina_protocol_widget.c
+index 307342009f493787d44f9b5cc34060ac7de4cb1d..9a7099c9c631bc3785540ef0fb685e40d7f68da9 100644
+--- a/src/remmina_protocol_widget.c
++++ b/src/remmina_protocol_widget.c
+@@ -1520,7 +1520,7 @@ static gboolean remmina_protocol_widget_dialog_mt_setup(gpointer user_data)
+ 	const gchar *s;
+ 
+ 	if (d->gp->cnnobj == NULL)
+-		return;
++		return FALSE;
+ 
+ 	mp = remmina_message_panel_new();
+ 
diff --git a/0002_drop_gnome_mediakeys_plugin_git_c901beef.patch b/0002_drop_gnome_mediakeys_plugin_git_c901beef.patch
new file mode 100644
index 0000000..af52209
--- /dev/null
+++ b/0002_drop_gnome_mediakeys_plugin_git_c901beef.patch
@@ -0,0 +1,10 @@
+diff --git a/data/desktop/remmina-gnome.session b/data/desktop/remmina-gnome.session
+index 15c883aae42c170cbe07f892b20b48c708bf750d..08e43f87d832dc682003204b6fb8bf5f56b31acd 100644
+--- a/data/desktop/remmina-gnome.session
++++ b/data/desktop/remmina-gnome.session
+@@ -2,4 +2,4 @@
+ 
+ [GNOME Session]
+ Name=remmina-gnome
+-RequiredComponents=org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;remmina-gnome
++RequiredComponents=org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;remmina-gnome
diff --git a/remmina.spec b/remmina.spec
index 759bfaf..6acd577 100644
--- a/remmina.spec
+++ b/remmina.spec
@@ -2,7 +2,7 @@
 
 Name: remmina
 Version: 1.4.24
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Remote Desktop Client
 License: GPLv2+ and MIT
 URL: https://remmina.org
@@ -20,8 +20,12 @@ ExcludeArch: aarch64
 # So we can't use it directly only as instructions.
 Source1: pluginBuild-CMakeLists.txt
 
+# Patches.
+Patch0: 0001_fix_rare_crash_git_2609548e_and_9ed4c438.patch
+Patch1: 0002_drop_gnome_mediakeys_plugin_git_c901beef.patch
+
 %if 0%{?fedora} || 0%{?rhel} >= 8
-BuildRequires: cmake >= 3.0.0
+BuildRequires: cmake
 %else
 BuildRequires: cmake3
 %endif
@@ -37,14 +41,14 @@ BuildRequires: libgcrypt-devel
 BuildRequires: libsodium-devel
 BuildRequires: xdg-utils
 BuildRequires: pkgconfig(appindicator3-0.1)
-BuildRequires: pkgconfig(avahi-ui) >= 0.6.30
-BuildRequires: pkgconfig(avahi-ui-gtk3) >= 0.6.30
+BuildRequires: pkgconfig(avahi-ui)
+BuildRequires: pkgconfig(avahi-ui-gtk3)
 BuildRequires: pkgconfig(freerdp2)
 BuildRequires: pkgconfig(gtk+-3.0)
 BuildRequires: pkgconfig(json-glib-1.0)
 BuildRequires: pkgconfig(libsecret-1)
 BuildRequires: pkgconfig(libsoup-2.4)
-BuildRequires: pkgconfig(libssh) >= 0.6
+BuildRequires: pkgconfig(libssh)
 BuildRequires: pkgconfig(libvncserver)
 BuildRequires: pkgconfig(spice-client-gtk-3.0)
 BuildRequires: pkgconfig(vte-2.91)
@@ -203,8 +207,6 @@ that shows up under the display manager session menu.
 %autosetup -p1 -n Remmina-v%{version}-%{release_commit_hash}
 
 %build
-mkdir -p build
-
 %if 0%{?fedora}
 # Workaround for Pango on Fedora 31+.
 export CFLAGS="%{optflags} -I%{_includedir}/harfbuzz"
@@ -230,7 +232,6 @@ export CFLAGS="%{optflags} -std=gnu99"
     -DWITH_TELEPATHY=OFF \
     -DWITH_VTE=ON \
     -DWITH_X2GO=ON
-
 %cmake3_build
 
 %install
@@ -327,6 +328,11 @@ fi
 %{_mandir}/man1/remmina-gnome.1.*
 
 %changelog
+* Sun Feb 27 2022 Phil Wyett <philip.wyett@kathenas.org> - 1.4.24-3
+- Add patch: 0001_fix_rare_crash_git_2609548e_and_9ed4c438.patch.
+- Add patch: 0002_drop_gnome_mediakeys_plugin_git_c901beef.patch.
+- Remove unneeded creation of 'build' folder.
+
 * Sat Feb 12 2022 Phil Wyett <philip.wyett@kathenas.org> - 1.4.24-2
 - Remove XDMCP reference from remmina package description.
 - Remove pyhoca-cli BuildRrequires. Only Requires on x2go now required.