diff -ur efibootmgr-0.5.3/src/efibootmgr/module.mk efibootmgr-0.5.3-4/src/efibootmgr/module.mk
--- efibootmgr-0.5.3/src/efibootmgr/module.mk	2004-06-09 23:45:42.000000000 +0200
+++ efibootmgr-0.5.3-4/src/efibootmgr/module.mk	2006-12-20 00:00:01.000000000 +0100
@@ -11,7 +11,7 @@
 efibootmgr_LIBDIR  := src/lib
 efibootmgr_FULLLIB := \
 	$(patsubst %,$(efibootmgr_LIBDIR)/%,$(efibootmgr_LIBS))
-LIBS = -lpci
+LIBS = -lpci -lz
 
 ALLDEPS += $(efibootmgr_FULLTARGET)
 CLEANLIST += $(efibootmgr_FULLTARGET)
diff -ur efibootmgr-0.5.3/src/lib/disk.c efibootmgr-0.5.3-4/src/lib/disk.c
--- efibootmgr-0.5.3/src/lib/disk.c	2005-08-10 07:25:48.000000000 +0200
+++ efibootmgr-0.5.3-4/src/lib/disk.c	2006-12-19 23:51:38.000000000 +0100
@@ -55,7 +55,7 @@
 		return 1;
 	}
 	major = buf.st_dev >> 8;
-	minor = buf.st_dev && 0xFF;
+	minor = buf.st_dev & 0xFF;
 
 	/* IDE disks can have up to 64 partitions, or 6 bits worth,
 	 * and have one bit for the disk number.
diff -ur efibootmgr-0.5.3/src/lib/efi.c efibootmgr-0.5.3-4/src/lib/efi.c
--- efibootmgr-0.5.3/src/lib/efi.c	2005-08-10 17:58:13.000000000 +0200
+++ efibootmgr-0.5.3-4/src/lib/efi.c	2006-12-19 23:52:21.000000000 +0100
@@ -35,6 +35,7 @@
 #include <linux/sockios.h>
 #include <net/if.h>
 #include <pci/pci.h>
+#include <linux/types.h>
 #include <linux/ethtool.h>
 #include "efi.h"
 #include "efichar.h"