diff --git a/fdisk/edit_disk.cgi b/fdisk/edit_disk.cgi
index 205fadfab..b48e94a7d 100755
--- a/fdisk/edit_disk.cgi
+++ b/fdisk/edit_disk.cgi
@@ -41,6 +41,10 @@ elsif ($usedpri != 4 && &supports_extended()) {
 	push(@edlinks, "<a href=\"edit_part.cgi?disk=$d->{'index'}&new=3\">".
 			$text{'index_addext'}."</a>");
 	}
+if ($d->{'table'} eq 'unknown') {
+	# Must create a partition table first
+	@edlinks = ( $text{'disk_needtable'} );
+	}
 
 # Show brief disk info
 @info = ( );
@@ -52,7 +56,12 @@ if ($d->{'model'}) {
 	}
 push(@info, &text('disk_cylinders', $d->{'cylinders'}));
 if ($d->{'table'}) {
-	push(@info, &text('disk_table', uc($d->{'table'})));
+	if ($d->{'table'} eq 'unknown') {
+		push(@info, $text{'disk_notable'});
+		}
+	else {
+		push(@info, &text('disk_table', uc($d->{'table'})));
+		}
 	}
 print &ui_links_row(\@info),"<p>\n";
 
@@ -125,9 +134,18 @@ if (&supports_smart($d)) {
 			      &ui_hidden("drive", $d->{'device'}));
 	}
 if (&supports_relabel($d)) {
-	print &ui_buttons_row("edit_relabel.cgi", $text{'index_relabel'},
-			      $text{'index_relabeldesc'},
-			      &ui_hidden("device", $d->{'device'}));
+	if ($d->{'table'} eq 'unknown') {
+		print &ui_buttons_row(
+			"edit_relabel.cgi", $text{'index_relabel2'},
+			$text{'index_relabeldesc2'},
+			&ui_hidden("device", $d->{'device'}));
+		}
+	else {
+		print &ui_buttons_row(
+			"edit_relabel.cgi", $text{'index_relabel'},
+			$text{'index_relabeldesc'},
+			&ui_hidden("device", $d->{'device'}));
+		}
 	}
 print &ui_buttons_end();
 
diff --git a/fdisk/lang/en b/fdisk/lang/en
index 3be4bed43..2471defa3 100644
--- a/fdisk/lang/en
+++ b/fdisk/lang/en
@@ -28,6 +28,8 @@ index_smartdesc=Displays the status reported by this drive, including temperatur
 index_blink=Identify drive
 index_relabel=Wipe Partitions
 index_relabeldesc=Delete all existing partitions and create a new partition table with a different format.
+index_relabel2=Create Partition Table
+index_relabeldesc=Create a new empty partition table on this disk, so that partitions can be added.
 index_use=Use
 index_free=Free
 index_return=disk list
@@ -285,7 +287,9 @@ disk_size=Size
 disk_dsize=<b>Disk size:</b> $1
 disk_model=<b>Make and model:</b> $1
 disk_cylinders=<b>Cylinders:</b> $1
-disk_table=<b>Partition format:</b> $1
+disk_table=<b>Partition table format:</b> $1
+disk_notable=<b>>Partition table format:</b> None created
+disk_needtable=No partitons can be created without a partition table.
 disk_return=list of partitions
 
 relabel_title=Wipe Partitions