diff --git a/ChangeLog b/ChangeLog
index ceca3fddb..028bffe5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-03  Philipp Matthias Hahn <pmhahn@debian.org>
+
+	* util/grub-mkrescue.in: Fix handling xorriso option.
+
 2011-11-03  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/gettext/gettext.c (grub_gettext_init_ext): Exit if local is
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 4c96dd42b..eff77088f 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -129,7 +129,7 @@ do
     --xorriso)
 	xorriso=`argument $option "$@"`; shift ;;
     --xorriso=*)
-        xorriso=`echo "${option}/" | sed 's/--xorriso=//'` ;;
+        xorriso=`echo "${option}" | sed 's/--xorriso=//'` ;;
 
     *)
 	source="${source} ${option} $@"; break ;;