diff --git a/src/lib/elfboot.c b/src/lib/elfboot.c
index 03bd3cda19..c94136dc27 100644
--- a/src/lib/elfboot.c
+++ b/src/lib/elfboot.c
@@ -367,6 +367,7 @@ static int build_elf_segment_list(
 	struct segment *ptr;
 	int i;
 	memset(head, 0, sizeof(*head));
+	head->phdr_next = head->phdr_prev = head;
 	head->next = head->prev = head;
 	for(i = 0; i < headers; i++) {
 		struct segment *new;