diff --git a/extra/efivar/build b/extra/efivar/build
index 47473ecc..8f51eebd 100755
--- a/extra/efivar/build
+++ b/extra/efivar/build
@@ -1,11 +1,8 @@
 #!/bin/sh -e
 
-# The order here matters.
-patch -p1 < b98ba8921010d03f46704a476c69861515deb1ca.patch
-patch -p1 < c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch
-patch -p1 < 0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch
-patch -p1 < fdb803402fb32fa6d020bac57a40c7efe4aabb7d.patch
-patch -p1 < 4e04afc2df9bbc26e5ab524b53a6f4f1e61d7c9e.patch
+for patch in *.patch; do
+    patch -p1 < "$patch"
+done
 
 # Avoid repeating ourselves.
 mk() {
@@ -17,5 +14,5 @@ mk() {
         "$@"
 }
 
-mk
+mk CC="${CC:-cc}"
 mk DESTDIR="$1" install
diff --git a/extra/efivar/checksums b/extra/efivar/checksums
index 0445affa..2b4c6a05 100644
--- a/extra/efivar/checksums
+++ b/extra/efivar/checksums
@@ -1,6 +1,6 @@
 3c67feb93f901b98fbb897d5ca82931a6698b5bcd6ac34f0815f670d77747b9f  efivar-37.tar.bz2
-475ca086eecabeaaff6111c3e6766f7e31d88a4fb6e0d082e34201e2cfaf295a  b98ba8921010d03f46704a476c69861515deb1ca.patch
-7e72f92eb0d03558b9b14ede6a68e29c0051ffe745a8c7a84d06dce6af458351  c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch
-c3dcda97408b7d4957d440b1802081d1861a9923c7d4eb5ee6d3c9e31ae668fc  0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch
-4d53ca9f09e3704aa0cc58f36cf475f9c0e54464305930d0ea9e26e7d0461ef6  fdb803402fb32fa6d020bac57a40c7efe4aabb7d.patch
-bc552a018399fb9c976b0087f3407ec34004f8b64a5982af76556dcd790852aa  4e04afc2df9bbc26e5ab524b53a6f4f1e61d7c9e.patch
+475ca086eecabeaaff6111c3e6766f7e31d88a4fb6e0d082e34201e2cfaf295a  00-b98ba8921010d03f46704a476c69861515deb1ca.patch
+7e72f92eb0d03558b9b14ede6a68e29c0051ffe745a8c7a84d06dce6af458351  01-c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch
+c3dcda97408b7d4957d440b1802081d1861a9923c7d4eb5ee6d3c9e31ae668fc  02-0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch
+4d53ca9f09e3704aa0cc58f36cf475f9c0e54464305930d0ea9e26e7d0461ef6  03-fdb803402fb32fa6d020bac57a40c7efe4aabb7d.patch
+bc552a018399fb9c976b0087f3407ec34004f8b64a5982af76556dcd790852aa  04-4e04afc2df9bbc26e5ab524b53a6f4f1e61d7c9e.patch
diff --git a/extra/efivar/patches/b98ba8921010d03f46704a476c69861515deb1ca.patch b/extra/efivar/patches/00-b98ba8921010d03f46704a476c69861515deb1ca.patch
similarity index 100%
rename from extra/efivar/patches/b98ba8921010d03f46704a476c69861515deb1ca.patch
rename to extra/efivar/patches/00-b98ba8921010d03f46704a476c69861515deb1ca.patch
diff --git a/extra/efivar/patches/c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch b/extra/efivar/patches/01-c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch
similarity index 100%
rename from extra/efivar/patches/c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch
rename to extra/efivar/patches/01-c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch
diff --git a/extra/efivar/patches/0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch b/extra/efivar/patches/02-0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch
similarity index 100%
rename from extra/efivar/patches/0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch
rename to extra/efivar/patches/02-0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch
diff --git a/extra/efivar/patches/fdb803402fb32fa6d020bac57a40c7efe4aabb7d.patch b/extra/efivar/patches/03-fdb803402fb32fa6d020bac57a40c7efe4aabb7d.patch
similarity index 100%
rename from extra/efivar/patches/fdb803402fb32fa6d020bac57a40c7efe4aabb7d.patch
rename to extra/efivar/patches/03-fdb803402fb32fa6d020bac57a40c7efe4aabb7d.patch
diff --git a/extra/efivar/patches/4e04afc2df9bbc26e5ab524b53a6f4f1e61d7c9e.patch b/extra/efivar/patches/04-4e04afc2df9bbc26e5ab524b53a6f4f1e61d7c9e.patch
similarity index 100%
rename from extra/efivar/patches/4e04afc2df9bbc26e5ab524b53a6f4f1e61d7c9e.patch
rename to extra/efivar/patches/04-4e04afc2df9bbc26e5ab524b53a6f4f1e61d7c9e.patch
diff --git a/extra/efivar/sources b/extra/efivar/sources
index 8d21f40e..4833b4ab 100644
--- a/extra/efivar/sources
+++ b/extra/efivar/sources
@@ -1,6 +1,6 @@
 https://github.com/rhboot/efivar/releases/download/37/efivar-37.tar.bz2
-patches/b98ba8921010d03f46704a476c69861515deb1ca.patch
-patches/c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch
-patches/0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch
-patches/fdb803402fb32fa6d020bac57a40c7efe4aabb7d.patch
-patches/4e04afc2df9bbc26e5ab524b53a6f4f1e61d7c9e.patch
+patches/00-b98ba8921010d03f46704a476c69861515deb1ca.patch
+patches/01-c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch
+patches/02-0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch
+patches/03-fdb803402fb32fa6d020bac57a40c7efe4aabb7d.patch
+patches/04-4e04afc2df9bbc26e5ab524b53a6f4f1e61d7c9e.patch