diff --git a/cmd/zpool/zpool_vdev.c b/cmd/zpool/zpool_vdev.c
index 723e10b3d..5309323b2 100644
--- a/cmd/zpool/zpool_vdev.c
+++ b/cmd/zpool/zpool_vdev.c
@@ -106,12 +106,34 @@ typedef struct vdev_disk_db_entry
  * negatives
  */
 static vdev_disk_db_entry_t vdev_disk_database[] = {
+	{"ATA     C400-MTFDDAC064M", 8192},
+	{"ATA     C400-MTFDDAC128M", 8192},
+	{"ATA     C400-MTFDDAC256M", 8192},
+	{"ATA     C400-MTFDDAC512M", 8192},
 	{"ATA     Corsair Force 3 ", 8192},
+	{"ATA     Corsair Force GS", 8192},
 	{"ATA     INTEL SSDSA2CT04", 8192},
+	{"ATA     INTEL SSDSA2CW04", 8192},
+	{"ATA     INTEL SSDSA2CW08", 8192},
+	{"ATA     INTEL SSDSA2CW12", 8192},
 	{"ATA     INTEL SSDSA2CW16", 8192},
+	{"ATA     INTEL SSDSA2CW30", 8192},
+	{"ATA     INTEL SSDSA2CW60", 8192},
+	{"ATA     INTEL SSDSC2BA10", 8192},
+	{"ATA     INTEL SSDSC2BA20", 8192},
+	{"ATA     INTEL SSDSC2BA40", 8192},
+	{"ATA     INTEL SSDSC2BA80", 8192},
+	{"ATA     INTEL SSDSC2CT06", 8192},
+	{"ATA     INTEL SSDSC2CT12", 8192},
 	{"ATA     INTEL SSDSC2CT18", 8192},
+	{"ATA     INTEL SSDSC2CT24", 8192},
+	{"ATA     INTEL SSDSC2CW06", 8192},
 	{"ATA     INTEL SSDSC2CW12", 8192},
+	{"ATA     INTEL SSDSC2CW18", 8192},
+	{"ATA     INTEL SSDSC2CW24", 8192},
+	{"ATA     INTEL SSDSC2CW48", 8192},
 	{"ATA     KINGSTON SH100S3", 8192},
+	{"ATA     KINGSTON SH103S3", 8192},
 	{"ATA     M4-CT064M4SSD2  ", 8192},
 	{"ATA     M4-CT128M4SSD2  ", 8192},
 	{"ATA     M4-CT256M4SSD2  ", 8192},
@@ -121,11 +143,23 @@ static vdev_disk_db_entry_t vdev_disk_database[] = {
 	{"ATA     OCZ-VERTEX3     ", 8192},
 	{"ATA     OCZ-VERTEX3 LT  ", 8192},
 	{"ATA     OCZ-VERTEX3 MI  ", 8192},
+	{"ATA     OCZ-VERTEX4     ", 8192},
+	{"ATA     SAMSUNG MZ7WD120", 8192},
+	{"ATA     SAMSUNG MZ7WD240", 8192},
+	{"ATA     SAMSUNG MZ7WD480", 8192},
+	{"ATA     SAMSUNG MZ7WD960", 8192},
 	{"ATA     SAMSUNG SSD 830 ", 8192},
 	{"ATA     Samsung SSD 840 ", 8192},
+	{"ATA     TOSHIBA THNSNH06", 8192},
+	{"ATA     TOSHIBA THNSNH12", 8192},
+	{"ATA     TOSHIBA THNSNH25", 8192},
+	{"ATA     TOSHIBA THNSNH51", 8192},
 	{"ATA     INTEL SSDSA2M040", 4096},
 	{"ATA     INTEL SSDSA2M080", 4096},
 	{"ATA     INTEL SSDSA2M160", 4096},
+	{"ATA     OCZ CORE_SSD    ", 4096},
+	{"ATA     SAMSUNG MCCOE32G", 4096},
+	{"ATA     SAMSUNG MCCOE64G", 4096},
 	/* Imported from Open Solaris*/
 	{"ATA     MARVELL SD88SA02", 4096},
 	/* Advanced format Hard drives */