diff --git a/ChangeLog b/ChangeLog
index 82e657382..16213a794 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-19  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/ieee1275/openfw.c (grub_ieee1275_parse_args): Extend
+	filename parsing to non-block devices.
+
 2012-06-19  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/device.c (grub_device_open): Remove dead code.
diff --git a/grub-core/kern/ieee1275/openfw.c b/grub-core/kern/ieee1275/openfw.c
index caf820df5..0fedad842 100644
--- a/grub-core/kern/ieee1275/openfw.c
+++ b/grub-core/kern/ieee1275/openfw.c
@@ -354,9 +354,6 @@ grub_ieee1275_parse_args (const char *path, enum grub_ieee1275_parse_type ptype)
 	char *comma;
 	char *args;
 
-	if (grub_strcmp ("block", type) != 0)
-	  goto unknown;
-
 	args = grub_ieee1275_get_devargs (path);
 	if (!args)
 	  /* Shouldn't happen.  */