diff --git a/main/grub/.checksums b/main/grub/.checksums
index 2bee46600..b1b07043c 100644
--- a/main/grub/.checksums
+++ b/main/grub/.checksums
@@ -1,3 +1,4 @@
 a1ec4bfb2ae5116db789397aa796683a  detect-venom-fallback-initrd.patch
+da388905710bb4cbfbc7bd7346ff9174  grub-2.06-upstream_fixes-1.patch
 cf0fd928b1e5479c8108ee52cb114363  grub-2.06.tar.xz
 b4a4d287513091e7e66eca5853101a93  grub.default
diff --git a/main/grub/.pkgfiles b/main/grub/.pkgfiles
index e15ed9c4c..60ac042ae 100644
--- a/main/grub/.pkgfiles
+++ b/main/grub/.pkgfiles
@@ -1,4 +1,4 @@
-grub-2.06-3
+grub-2.06-4
 drwxr-xr-x root/root    etc/
 drwxr-xr-x root/root    etc/bash_completion.d/
 -rw-r--r-- root/root    etc/bash_completion.d/grub
diff --git a/main/grub/spkgbuild b/main/grub/spkgbuild
index 4a60d3418..0eb3756b8 100755
--- a/main/grub/spkgbuild
+++ b/main/grub/spkgbuild
@@ -3,11 +3,12 @@
 
 name=grub
 version=2.06
-release=3
+release=4
 backup="etc/default/grub"
 source="https://ftp.gnu.org/gnu/$name/$name-$version.tar.xz
 	grub.default
-	detect-venom-fallback-initrd.patch"
+	detect-venom-fallback-initrd.patch
+	https://www.linuxfromscratch.org/patches/blfs/svn/grub-2.06-upstream_fixes-1.patch"
 
 build() {
 	# workaround for https://savannah.gnu.org/bugs/?60458
@@ -19,20 +20,26 @@ build() {
 
 	patch -Np1 -i $SRC/detect-venom-fallback-initrd.patch
 
-	# fix os name
+	# Fix an issue causing grub-install to fail when the /boot partition 
+	# (or the root partition if /boot is not a separate partition) 
+	# is created by e2fsprogs-1.47.0 or later:
+	patch -Np1 -i $SRC/grub-2.06-upstream_fixes-1.patch
+	
+	# Fix os name
 	sed 's|GNU/Linux|Linux|' -i "util/grub.d/10_linux.in"
 
 	autoreconf -fv
 	./configure --prefix=/usr \
-	            --sbindir=/sbin \
-	            --sysconfdir=/etc \
-	            --disable-efiemu \
-	            --disable-werror \
-		    --enable-grub-mount
+		--sbindir=/sbin \
+		--sysconfdir=/etc \
+		--disable-efiemu \
+		--disable-werror \
+		--enable-device-mapper \
+		--enable-grub-mount
 	make
 	make DESTDIR=$PKG install
 
 
-	# borrow from Arch
+	# Borrow from Arch
 	install -D -m0644 $SRC/grub.default $PKG/etc/default/grub
 }