diff --git a/bind8/edit_soptions.cgi b/bind8/edit_soptions.cgi
index c05951553..963810f6c 100755
--- a/bind8/edit_soptions.cgi
+++ b/bind8/edit_soptions.cgi
@@ -44,7 +44,7 @@ print &opt_input($text{'slave_max'}, "max-transfer-time-in",
 		 $zconf, $text{'default'}, 4, $text{'slave_mins'});
 
 # Slave records file
-print &opt_input($text{'slave_file'}, "file", $zconf, $text{'slave_none'}, 40);
+print &opt_input($text{'slave_file'}, "file", $zconf, $text{'slave_none'}, 80);
 
 print &choice_input($text{'slave_check'}, "check-names", $zconf,
 		    $text{'warn'}, "warn", $text{'fail'}, "fail",
@@ -53,6 +53,9 @@ print &choice_input($text{'slave_notify'}, "notify", $zconf,
 		    $text{'yes'}, "yes", $text{'no'}, "no",
 		    $text{'explicit'}, "explicit",
 		    $text{'default'}, undef);
+print &choice_input($text{'slave_format'}, "masterfile-format", $zconf,
+		    $text{'slave_raw'}, "raw", $text{'slave_text'}, "text",
+		    $text{'default'}, undef);
 
 print &addr_match_input($text{'slave_update'}, "allow-update", $zconf);
 print &addr_match_input($text{'slave_transfer'}, "allow-transfer", $zconf);
diff --git a/bind8/lang/en b/bind8/lang/en
index 8591277d8..c356e93b3 100644
--- a/bind8/lang/en
+++ b/bind8/lang/en
@@ -185,6 +185,9 @@ slave_max=Maximum transfer time
 slave_file=Records file
 slave_check=Check names?
 slave_notify=Notify slaves of changes?
+slave_format=Zone file format
+slave_raw=Raw binary
+slave_text=Plain text
 slave_update=Allow updates from..
 slave_transfer=Allow transfers from..
 slave_query=Allow queries from..
diff --git a/bind8/save_slave.cgi b/bind8/save_slave.cgi
index 10d5f716e..28299d347 100755
--- a/bind8/save_slave.cgi
+++ b/bind8/save_slave.cgi
@@ -29,6 +29,7 @@ $access{'opts'} || &error($text{'master_eoptscannot'});
 &save_opt("file", \&file_check, $z, $indent);
 &save_choice("check-names", $z, $indent);
 &save_choice("notify", $z, $indent);
+&save_choice("masterfile-format", $z, $indent);
 &save_addr_match("allow-update", $z, $indent);
 &save_addr_match("allow-transfer", $z, $indent);
 &save_addr_match("allow-query", $z, $indent);
diff --git a/bind8/slave_form.cgi b/bind8/slave_form.cgi
index 3ad13069f..0e98128c3 100755
--- a/bind8/slave_form.cgi
+++ b/bind8/slave_form.cgi
@@ -52,12 +52,12 @@ print &ui_table_row($text{'slave_file'},
 print &ui_table_row($text{'slave_masters'},
 	&ui_textarea("masters",
 		     join("\n", split(/\s+/, $config{'default_master'})),
-		     4, 30));
+		     4, 30), 3);
 
 # Master port
 print &ui_table_row($text{'slave_masterport'},
 	&ui_opt_textbox("port", undef, 5, $text{'default'},
-		        $text{'slave_master_port'}));
+		        $text{'slave_master_port'}), 3);
 
 # Create on slave servers?
 my @servers = grep { $_->{'sec'} } &list_slave_servers();