diff --git a/ChangeLog b/ChangeLog
index 5b0b13f1f..9c283c137 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-21  Robert Millan  <robertmh@gnu.org>
+
+	Patch from David Weinehall <tao@debian.org>
+	* util/mkbimage: Fix XSI-isms (for supporting POSIX-only shells).
+
 2004-07-20  Robert Millan  <robertmh@gnu.org>
 
 	* util/grub-install.in: Detect GNU/k*BSD systems as well.
diff --git a/THANKS b/THANKS
index 040398358..c008e0b0c 100644
--- a/THANKS
+++ b/THANKS
@@ -26,6 +26,7 @@ Chip Salzenberg <chip@valinux.com>
 Christian Jones <chjones@aleph0.com>
 Christoph Plattner <Christoph.Plattner@dot.at>
 Damian Ivereigh <damian@cisco.com>
+David Weinehall <tao@debian.org>
 Dan J. Walters <djw@cs.utexas.edu>
 Daniel Farrell <s2108287@student.rmit.edu.au>
 Daniel Pittman <daniel@rimspace.net>
diff --git a/util/mkbimage b/util/mkbimage
index 52c229c04..48b119c0f 100644
--- a/util/mkbimage
+++ b/util/mkbimage
@@ -1,7 +1,7 @@
 #!/bin/sh
 # MaKe a Bootable IMAGE --- 1.44, 2.88 and El Torito no-emulation mode
 # C) 2001,2002,2003 Thierry Laronde <tlaronde@polynum.org>
-# C) 2001,2002,2003 Robert Millan <zeratul2@wanadoo.es>
+# C) 2001,2002,2003 Robert Millan <robertmh@gnu.org>
 
 
 # This program is free software; you can redistribute it and/or modify
@@ -232,10 +232,10 @@ done
 
 if [ ! "$image_type" ]; then
 	image_type=hd;
-elif [ "$image_type" != "1.20" -a "$image_type" != "1.44" \
-  -a "$image_type" != "1.60" -a "$image_type" != "1.68" \
-  -a "$image_type" != "2.88" -a "$image_type" != "1.74" \
-  -a "$image_type" != "hd" -a "$image_type" != "1.60" ] ; then
+elif [ "$image_type" != "1.20" ] && [ "$image_type" != "1.44" ] \
+  && [ "$image_type" != "1.60" ] && [ "$image_type" != "1.68" ] \
+  && [ "$image_type" != "2.88" ] && [ "$image_type" != "1.74" ] \
+  && [ "$image_type" != "hd" ] && [ "$image_type" != "1.60" ] ; then
   error wrong_type ;
 fi