diff --git a/bsdfdisk/bsdfdisk-lib.pl b/bsdfdisk/bsdfdisk-lib.pl
index 3987a8981..9e31d7670 100644
--- a/bsdfdisk/bsdfdisk-lib.pl
+++ b/bsdfdisk/bsdfdisk-lib.pl
@@ -4,8 +4,6 @@
 # XXX include in makedist.pl
 # XXX exclude from Solaris, RPM, Deb
 # XXX editing parititions and slices
-# XXX top-level is really called slice?
-# XXX disk cylinders don't match slice size
 
 use strict;
 use warnings;
@@ -17,8 +15,10 @@ use WebminCore;
 
 sub check_fdisk
 {
-if (!&has_command("fdisk")) {
-	return &text('index_ecmd', "<tt>fdisk</tt>");
+foreach my $cmd ("fdisk", "disklabel", "gpart") {
+	if (!&has_command($cmd)) {
+		return &text('index_ecmd', "<tt>$cmd</tt>");
+		}
 	}
 return undef;
 }
@@ -118,10 +118,11 @@ foreach my $dev (glob("/dev/ada[0-9]"),
 			if ($l =~ /^\s*([a-z]):\s+(\d+)\s+(\d+)\s+(\S+)/ &&
 			    $4 ne 'unused') {
 				my $part = { 'letter' => $1,
-					     'size' => $2,
-					     'offet' => $3,
+					     'blocks' => $2,
+					     'startblock' => $3,
 					     'type' => $4,
 					     'device' =>$slice->{'device'}.$1 };
+				# XXX how to get size?
 				push(@{$slice->{'parts'}}, $part);
 				}
 			}
@@ -155,7 +156,7 @@ if ($pfx =~ /^t/i) {
 return undef;
 }
 
-# partition_select(...)
+# partition_select(name, value, mode, &found, disk-regexp)
 # Returns HTML for a selector for a slice. The mode parameter means :
 # 1 = disks
 # 2 = disks and partitions
@@ -178,6 +179,9 @@ foreach my $d (@dlist) {
 			}
 		}
 	}
+if ($found && &indexof($value, map { $_->[0] } @opts) >= 0) {
+	$$found = 1;
+	}
 return &ui_select($name, $value, \@opts);
 }
 
diff --git a/mount/freebsd-lib.pl b/mount/freebsd-lib.pl
index d8d039a48..9e24d22f8 100755
--- a/mount/freebsd-lib.pl
+++ b/mount/freebsd-lib.pl
@@ -1,12 +1,13 @@
 # freebsd-lib.pl
 # Mount table functions for freebsd
 
-$uname_release = `uname -r`;
+$uname_release = &backquote_command("uname -r");
 if (&has_command("mount_smbfs")) {
 	$smbfs_support = 1;
 	$nsmb_conf = "/etc/nsmb.conf";
 	}
 $ide_device_prefix = $uname_release > 9 ? "ada" : "ad";
+&foreign_require("bsdfdisk");
 
 # Return information about a filesystem, in the form:
 #  directory, device, type, options, fsck_order, mount_at_boot
@@ -410,34 +411,18 @@ else {
 		# Disk-based filesystem
 		$msg = &fstype_name($type);
 		}
-	local ($disk_dev, $ide_t, $ide_s, $ide_p, $scsi_t, $scsi_s, $scsi_p);
-	if ($loc =~ /^\/dev\/\Q$ide_device_prefix\E(\d)s(\d)([a-z]*)$/) {
-		$disk_dev = 0; $ide_t = $1; $ide_s = $2; $ide_p = $3;
-		}
-	elsif ($loc =~ /^\/dev\/da(\d)s(\d)([a-z]*)$/) {
-		$disk_dev = 1; $scsi_t = $1; $scsi_s = $2; $scsi_p = $3;
-		}
-	else { $disk_dev = 2; }
 
+	# Generate disk selection options
+	my @opts;
+	my $found;
+	my $sel = &bsdfdisk::partition_select(
+		"disk_select", $loc, 3, \$found);
+	push(@opts, [ 0, $text{'freebsd_select'}, $sel ]);
+	push(@opts, [ 1, $text{'freebsd_other'},
+		      &ui_textbox("dev_path", $found ? "" : $loc, 40).
+		      " ".&file_chooser_button("dev_path", 0) ]);
 	print &ui_table_row($msg,
-		&ui_radio_table("disk_dev", $disk_dev,
-		  [ [ 0, $text{'freebsd_ide'},
-		      $text{'freebsd_device'}." ".
-		        &ui_textbox("ide_t", $ide_t, 4)." ".
-		      $text{'freebsd_slice'}." ".
-		        &ui_textbox("ide_s", $ide_s, 4)." ".
-		      $text{'freebsd_part'}." ".
-		        &ui_textbox("ide_p", $ide_p, 4) ],
-		    [ 1, $text{'freebsd_scsi'},
-		      $text{'freebsd_device'}." ".
-		        &ui_textbox("scsi_t", $scsi_t, 4)." ".
-		      $text{'freebsd_slice'}." ".
-		        &ui_textbox("scsi_s", $scsi_s, 4)." ".
-		      $text{'freebsd_part'}." ".
-		        &ui_textbox("scsi_p", $scsi_p, 4) ],
-		    [ 2, $text{'freebsd_other'},
-		      &ui_textbox("dev_path", $disk_dev == 2 ? $loc : "", 40).
-		      " ".&file_chooser_button("dev_path", 0) ] ]));
+		&ui_radio_table("disk_dev", $found ? 0 : 1, \@opts));
 	}
 }
 
@@ -759,25 +744,13 @@ elsif ($_[0] eq "smbfs") {
 else {
 	# This is some kind of disk-based filesystem.. get the device name
 	if ($in{'disk_dev'} == 0) {
-		$in{'ide_t'} =~ /^\d+$/ ||
-			&error("'$in{ide_t}' is not a valid device number");
-		$in{'ide_s'} =~ /^\d+$/ ||
-			&error("'$in{ide_s}' is not a valid slice number");
-		$in{'ide_p'} =~ /^[a-z]*$/ ||
-			&error("'$in{ide_p}' is not a valid partition letter");
-		$dv = "/dev/$ide_device_prefix$in{ide_t}s$in{ide_s}$in{ide_p}";
-		}
-	elsif ($in{'disk_dev'} == 1) {
-		$in{'scsi_t'} =~ /^\d+$/ ||
-			&error("'$in{scsi_t}' is not a valid device number");
-		$in{'scsi_s'} =~ /^\d+$/ ||
-			&error("'$in{scsi_s}' is not a valid slice number");
-		$in{'scsi_p'} =~ /^[a-z]*$/ ||
-			&error("'$in{scsi_p}' is not a valid partition letter");
-		$dv = "/dev/da$in{scsi_t}s$in{scsi_s}$in{scsi_p}";
+		# From menu
+		$dv = $in{'disk_select'};
 		}
 	else {
+		# Manually entered
 		$dv = $in{'dev_path'};
+		$dv =~ /^\// || &error($text{'freebsd_edevpath'});
 		}
 
 	# If the device entered is a symlink, follow it
@@ -789,7 +762,7 @@ else {
 		}
 
 	# Check if the device actually exists and uses the right filesystem
-	(-r $dv) || &error("The device file '$dv' does not exist");
+	(-r $dv) || &error(&text('freebsd_edevfile', $dv));
 	return $dv;
 	}
 }
@@ -986,10 +959,10 @@ sub device_name
 {
 my ($dev) = @_;
 if ($dev =~ /^\/dev\/(ad|ada)(\d)s(\d)([a-z]*)$/) {
-	return &text('freebsd_idedev', "$2", "$3", "$4");
+	return &text('freebsd_idedev', "$2", "$3", uc($4));
 	}
 elsif ($dev =~ /^\/dev\/(da)(\d)s(\d)([a-z]*)$/) {
-	return &text('freebsd_scsidev', "$2", "$3", "$4");
+	return &text('freebsd_scsidev', "$2", "$3", uc($4));
 	}
 else {
 	return $dev;
diff --git a/mount/lang/en b/mount/lang/en
index 3915ea9db..64a7c3380 100644
--- a/mount/lang/en
+++ b/mount/lang/en
@@ -479,8 +479,11 @@ freebsd_slice=Slice
 freebsd_part=Partition
 freebsd_scsi=SCSI disk
 freebsd_other=Other device
+freebsd_select=Disk partition
 freebsd_idedev=IDE device $1, slice $2, partition $3
 freebsd_scsidev=SCSI device $1, slice $2, partition $3
+freebsd_edevpath=Other device must be an absolute path, like /dev/cdrom
+freebsd_edevfile=The device file '$1' does not exist
 
 cswap_file=The swap file $1 does not exist.
 cswap_size=Create and mount a swap file with size