Index: thunar-vfs/thunar-vfs-volume-hal.c
===================================================================
--- thunar-vfs/thunar-vfs-volume-hal.c	(revision 25235)
+++ thunar-vfs/thunar-vfs-volume-hal.c	(working copy)
@@ -387,6 +387,7 @@
   gchar *mount_root;
   gchar *basename;
   gchar *filename;
+  gchar *fsusage = NULL;
 
   _thunar_vfs_return_if_fail (THUNAR_VFS_IS_VOLUME_HAL (volume_hal));
   _thunar_vfs_return_if_fail (hd != NULL);
@@ -486,11 +487,30 @@
       volume_hal->kind = THUNAR_VFS_VOLUME_KIND_FLOPPY;
       break;
 
+    case LIBHAL_DRIVE_TYPE_DISK:
+      volume_hal->kind = THUNAR_VFS_VOLUME_KIND_HARDDISK;
+      fsusage = libhal_device_get_property_string (context, volume_hal->udi, "volume.fsusage", NULL);
+      if (!fsusage || strcmp(fsusage, "filesystem") ||
+      libhal_device_get_property_bool (context, volume_hal->udi, "volume.ignore", NULL))       {
+          volume_hal->kind = THUNAR_VFS_VOLUME_KIND_UNKNOWN;
+      }
+      break;
+
+    case LIBHAL_DRIVE_TYPE_REMOVABLE_DISK:
+      volume_hal->kind = THUNAR_VFS_VOLUME_KIND_REMOVABLE_DISK;
+      break;
+
+    case LIBHAL_DRIVE_TYPE_FLASHKEY:
+      volume_hal->kind = THUNAR_VFS_VOLUME_KIND_USBSTICK;
+      break;
+
     case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER:
       volume_hal->kind = THUNAR_VFS_VOLUME_KIND_AUDIO_PLAYER;
       break;
 
     case LIBHAL_DRIVE_TYPE_SMART_MEDIA:
+    case LIBHAL_DRIVE_TYPE_COMPACT_FLASH:
+    case LIBHAL_DRIVE_TYPE_MEMORY_STICK:
     case LIBHAL_DRIVE_TYPE_SD_MMC:
       volume_hal->kind = THUNAR_VFS_VOLUME_KIND_MEMORY_CARD;
       break;
Index: thunar-vfs/thunar-vfs-volume.c
===================================================================
--- thunar-vfs/thunar-vfs-volume.c	(revision 25235)
+++ thunar-vfs/thunar-vfs-volume.c	(working copy)
@@ -338,6 +338,7 @@
     case THUNAR_VFS_VOLUME_KIND_AUDIO_CD:
     case THUNAR_VFS_VOLUME_KIND_MEMORY_CARD:
     case THUNAR_VFS_VOLUME_KIND_REMOVABLE_DISK:
+    case THUNAR_VFS_VOLUME_KIND_HARDDISK:
       return TRUE;
 
     default: