diff --git a/extra/efibootmgr/build b/extra/efibootmgr/build
index b9007d9f..db54756c 100755
--- a/extra/efibootmgr/build
+++ b/extra/efibootmgr/build
@@ -6,5 +6,5 @@ mkdir -p \
     "$1/usr/bin" \
     "$1/usr/share/man/man8"
 
-cp -f src/efibootmgr   "$1/usr/bin"
-cp -f src/efibootmgr.8 "$1/usr/share/man/man8"
+cp -f src/efibootmgr      "$1/usr/bin"
+cp -f src/efibootmgr.8.in "$1/usr/share/man/man8/efibootmgr.8"
diff --git a/extra/efibootmgr/checksums b/extra/efibootmgr/checksums
index 0f0a755c..0e331029 100644
--- a/extra/efibootmgr/checksums
+++ b/extra/efibootmgr/checksums
@@ -1 +1 @@
-06147c05c3f15271fc74c1761eb8fdb8ed3c252786c8d0b4f514a451825ecf3e
+a9b14eaf74cc4a7cb95a0086a262bf34f870dd7e3dce99ff235e326b6a3d8528
diff --git a/extra/efibootmgr/sources b/extra/efibootmgr/sources
index 3e6cee81..434c4628 100644
--- a/extra/efibootmgr/sources
+++ b/extra/efibootmgr/sources
@@ -1 +1 @@
-https://github.com/rhboot/efibootmgr/archive/97668ae0bce776a36ea2001dea63d376be8274ac.tar.gz
+https://github.com/rhboot/efibootmgr/archive/4069341e184471dccf407ca8410daa4c4fd634f5.tar.gz
diff --git a/extra/efibootmgr/version b/extra/efibootmgr/version
index a32ee556..293443cf 100644
--- a/extra/efibootmgr/version
+++ b/extra/efibootmgr/version
@@ -1 +1 @@
-17 5
+17 6