diff --git a/ChangeLog b/ChangeLog
index 4d13b8f80..5dbedeff4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-14 Felix Zielcke <fzielcke@z-51.de>
+
+	Fix a segfault with parsing unknown long options.
+
+	* util/grub-mkrelpath.c (options): Zero terminate it.
+
 2009-12-13  Carles Pina i Estany  <carles@pina.cat>
 
 	* include/grub/misc.h (grub_puts): New declaration.
diff --git a/util/grub-mkrelpath.c b/util/grub-mkrelpath.c
index a20109628..956e52ed7 100644
--- a/util/grub-mkrelpath.c
+++ b/util/grub-mkrelpath.c
@@ -27,6 +27,7 @@ static struct option options[] =
   {
     {"help", no_argument, 0, 'h'},
     {"version", no_argument, 0, 'V'},
+    {0, 0, 0, 0},
   };
 
 static void