Index: thunar-vfs/thunar-vfs-volume-hal.c
===================================================================
--- thunar-vfs/thunar-vfs-volume-hal.c	(revision 24277)
+++ thunar-vfs/thunar-vfs-volume-hal.c	(working copy)
@@ -465,16 +465,33 @@
 
   /* determine the new label */
   g_free (volume_hal->device_label);
-  volume_label = (hv != NULL) ? libhal_volume_get_label (hv) : libhal_drive_get_model (hd);
+  volume_label = (hv != NULL) ? libhal_volume_get_label (hv) : NULL;
   if (G_LIKELY (volume_label != NULL && *volume_label != '\0'))
     {
-      /* just use the label provided by HAL */
+      /* just use the volume label provided by HAL */
       volume_hal->device_label = g_strdup (volume_label);
     }
   else
     {
-      /* use the basename of the device file as label */
-      volume_hal->device_label = g_path_get_basename (volume_hal->device_file);
+      /* we need to come up with a usable name */
+      switch (libhal_drive_get_type (hd))
+        {
+        case LIBHAL_DRIVE_TYPE_FLOPPY:
+          if (libhal_drive_is_hotpluggable (hd))
+            volume_hal->device_label = g_strdup (_("External Floppy Drive"));
+          else
+            volume_hal->device_label = g_strdup (_("Floppy Drive"));
+          break;
+
+        case LIBHAL_DRIVE_TYPE_SD_MMC:
+          volume_hal->device_label = g_strdup (_("SD/MMC Drive"));
+          break;
+
+        default:
+          /* use the basename of the device file as label */
+          volume_hal->device_label = g_path_get_basename (volume_hal->device_file);
+          break;
+        }
     }
 
   /* release the previous mount point (if any) */
@@ -542,6 +559,10 @@
       volume_hal->kind = THUNAR_VFS_VOLUME_KIND_AUDIO_PLAYER;
       break;
 
+    case LIBHAL_DRIVE_TYPE_SD_MMC:
+      volume_hal->kind = THUNAR_VFS_VOLUME_KIND_SD_MMC;
+      break;
+
     default:
       /* check if the drive is connected to the USB bus */
       if (libhal_drive_get_bus (hd) == LIBHAL_DRIVE_BUS_USB)
Index: thunar-vfs/thunar-vfs-volume.c
===================================================================
--- thunar-vfs/thunar-vfs-volume.c	(revision 24277)
+++ thunar-vfs/thunar-vfs-volume.c	(working copy)
@@ -333,6 +333,7 @@
     case THUNAR_VFS_VOLUME_KIND_FLOPPY:
     case THUNAR_VFS_VOLUME_KIND_USBSTICK:
     case THUNAR_VFS_VOLUME_KIND_AUDIO_PLAYER:
+    case THUNAR_VFS_VOLUME_KIND_SD_MMC:
       return TRUE;
 
     default:
@@ -445,6 +446,11 @@
         return "gnome-dev-ipod";
       break;
 
+    case THUNAR_VFS_VOLUME_KIND_SD_MMC:
+      if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-media-sdmmc"))
+        return "gnome-dev-media-sdmmc";
+      break;
+
     default:
       break;
     }
Index: thunar-vfs/thunar-vfs-volume.h
===================================================================
--- thunar-vfs/thunar-vfs-volume.h	(revision 24277)
+++ thunar-vfs/thunar-vfs-volume.h	(working copy)
@@ -53,6 +53,7 @@
  * @THUNAR_VFS_VOLUME_KIND_HARDDISK     : Hard disk drives.
  * @THUNAR_VFS_VOLUME_KIND_USBSTICK     : USB sticks.
  * @THUNAR_VFS_VOLUME_KIND_AUDIO_PLAYER : Portable audio players (i.e. iPod).
+ * @THUNAR_VFS_VOLUME_KIND_SD_MMC       : Smart card.
  *
  * Describes the type of a VFS volume.
  **/
@@ -72,6 +73,7 @@
   THUNAR_VFS_VOLUME_KIND_HARDDISK,
   THUNAR_VFS_VOLUME_KIND_USBSTICK,
   THUNAR_VFS_VOLUME_KIND_AUDIO_PLAYER,
+  THUNAR_VFS_VOLUME_KIND_SD_MMC,
 } ThunarVfsVolumeKind;
 
 /**