diff --git a/Makefile.util.def b/Makefile.util.def
index ec69149f0..d3f9808f2 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -317,6 +317,7 @@ program = {
   common = util/grub-mkdevicemap.c;
   common = util/deviceiter.c;
   common = util/devicemap.c;
+  common = grub-core/osdep/init.c;
 
   ldadd = libgrubmods.a;
   ldadd = libgrubgcry.a;
diff --git a/debian/patches/restore_mkdevicemap.patch b/debian/patches/restore_mkdevicemap.patch
index 8e2a0cea3..d4a8f2522 100644
--- a/debian/patches/restore_mkdevicemap.patch
+++ b/debian/patches/restore_mkdevicemap.patch
@@ -2,7 +2,7 @@ Index: b/Makefile.util.def
 ===================================================================
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -310,6 +310,22 @@
+@@ -310,6 +310,23 @@
  };
  
  program = {
@@ -13,6 +13,7 @@ Index: b/Makefile.util.def
 +  common = util/grub-mkdevicemap.c;
 +  common = util/deviceiter.c;
 +  common = util/devicemap.c;
++  common = grub-core/osdep/init.c;
 +
 +  ldadd = libgrubmods.a;
 +  ldadd = libgrubgcry.a;
diff --git a/debian/patches/uefi_firmware_setup.patch b/debian/patches/uefi_firmware_setup.patch
index fabbd5ae2..0389783fd 100644
--- a/debian/patches/uefi_firmware_setup.patch
+++ b/debian/patches/uefi_firmware_setup.patch
@@ -7,7 +7,7 @@ Index: b/Makefile.util.def
 ===================================================================
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -489,6 +489,12 @@
+@@ -490,6 +490,12 @@
  };
  
  script = {