diff --git a/0004-Determine-GRUB-directory-relative-path-to-use-in-con.patch b/0004-Determine-GRUB-directory-relative-path-to-use-in-con.patch
new file mode 100644
index 0000000..5e81a52
--- /dev/null
+++ b/0004-Determine-GRUB-directory-relative-path-to-use-in-con.patch
@@ -0,0 +1,42 @@
+From 79fa095319696a9e91ab35cc694cdf9919a3428f Mon Sep 17 00:00:00 2001
+From: Javier Martinez Canillas <javierm@redhat.com>
+Date: Mon, 22 Feb 2021 19:25:01 +0100
+Subject: [PATCH] Determine GRUB directory relative path to use in config file
+
+Currently Anaconda is only checking whether /boot/ is a mount point or not
+to use the proper relative path to the GRUB directory. But there are more
+cases than this, for example /boot/grub2 could be a symlink or a subvolume
+in a btrfs filesystem.
+
+Use the grub2-mkrelpath tool to figure out the actual relative path that
+has to be used in the GRUB config file.
+
+Resolves: rhbz#1928588
+
+Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
+---
+ pyanaconda/modules/storage/bootloader/efi.py | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/pyanaconda/modules/storage/bootloader/efi.py b/pyanaconda/modules/storage/bootloader/efi.py
+index 8c08b8c68d..425cb31954 100644
+--- a/pyanaconda/modules/storage/bootloader/efi.py
++++ b/pyanaconda/modules/storage/bootloader/efi.py
+@@ -173,10 +173,11 @@ class EFIGRUB(EFIBase, GRUB2):
+         with open(config_path, "w") as fd:
+             grub_dir = self.config_dir
+             fs_uuid = self.stage2_device.format.uuid
+-            mountpoint = self.stage2_device.format.mountpoint
+ 
+-            if mountpoint != "/" and grub_dir.startswith(mountpoint):
+-                grub_dir = grub_dir[len(mountpoint):]
++            grub_dir = util.execWithCapture("grub2-mkrelpath", [grub_dir],
++                                            root=conf.target.system_root)
++            if not grub_dir:
++                raise BootLoaderError("Could not get GRUB directory path")
+ 
+             fd.write("search --no-floppy --fs-uuid --set=dev %s\n" % fs_uuid)
+             fd.write("set prefix=($dev)%s\n" % grub_dir)
+-- 
+2.26.2
+
diff --git a/0005-The-network-spoke-should-be-visible-in-live-spins-19.patch b/0005-The-network-spoke-should-be-visible-in-live-spins-19.patch
new file mode 100644
index 0000000..4a41fbe
--- /dev/null
+++ b/0005-The-network-spoke-should-be-visible-in-live-spins-19.patch
@@ -0,0 +1,33 @@
+From 89fb55d22f64eda26d18c735dfd59ee99b5191c2 Mon Sep 17 00:00:00 2001
+From: Vendula Poncova <vponcova@redhat.com>
+Date: Tue, 23 Feb 2021 15:50:50 +0100
+Subject: [PATCH] The network spoke should be visible in live spins (#1932961)
+
+It should be always possible to configure the hostname for the target system
+in the graphical network spoke, unless the spoke was specifically disabled in
+the Anaconda configuration files.
+
+This regression was caused by the commit 6b80b7b.
+
+Resolves: rhbz#1932961
+---
+ pyanaconda/ui/gui/spokes/network.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py
+index 1ef468a084..3cae5b4489 100644
+--- a/pyanaconda/ui/gui/spokes/network.py
++++ b/pyanaconda/ui/gui/spokes/network.py
+@@ -1472,7 +1472,8 @@ class NetworkSpoke(FirstbootSpokeMixIn, NormalSpoke):
+         if not FirstbootSpokeMixIn.should_run(environment, data):
+             return False
+ 
+-        return conf.system.can_configure_network
++        # Always allow to configure the hostname for the target system.
++        return True
+ 
+     def __init__(self, *args, **kwargs):
+         NormalSpoke.__init__(self, *args, **kwargs)
+-- 
+2.26.2
+
diff --git a/anaconda.spec b/anaconda.spec
index 6c029d0..31a3f98 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,7 +1,7 @@
 Summary: Graphical system installer
 Name:    anaconda
 Version: 34.24.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and MIT
 URL:     http://fedoraproject.org/wiki/Anaconda
 
@@ -23,6 +23,9 @@ Patch1: 0002-Revert-Do-not-support-no-inst.-Anaconda-boot-args-in.patch
 Patch2: 0003-Do-not-require-inst.-prefixes-for-Anaconda-boot-argu.patch
 %endif
 
+Patch3: 0004-Determine-GRUB-directory-relative-path-to-use-in-con.patch
+Patch4: 0005-The-network-spoke-should-be-visible-in-live-spins-19.patch
+
 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).
 
@@ -423,6 +426,10 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Thu Feb 25 2021 Martin Kolman <mkolman@redhat.com> - 34.24.5-2
+- Determine GRUB directory relative path to use in config file (#1928588) (javierm)
+- The network spoke should be visible in live spins (#1932961) (vponcova)
+
 * Mon Feb 22 2021 Martin Kolman <mkolman@redhat.com> - 34.24.5-1
 - Add the "Encrypt my data" checkbox to the custom partitioning spoke
   (vponcova)