diff --git a/ChangeLog b/ChangeLog
index ddc838998..2d90923e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-06-08  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Bugfix: install on partitionless device
+
+	* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): check if os_dev
+	is a whole disk
+
 2009-06-08  Felix Zielcke  <fzielcke@z-51.de>
 
 	* Makefile.in (uninstall): Remove all $include_DATA files.
diff --git a/util/hostdisk.c b/util/hostdisk.c
index eaccb73dc..a7262dd8f 100644
--- a/util/hostdisk.c
+++ b/util/hostdisk.c
@@ -883,6 +883,10 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
 		  "no mapping exists for `%s'", os_dev);
       return 0;
     }
+
+  if (grub_strcmp (os_dev, convert_system_partition_to_system_disk (os_dev)) 
+      == 0)
+    return make_device_name (drive, -1, -1);
   
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
   if (! S_ISCHR (st.st_mode))