diff --git a/samba/edit_fperm.cgi b/samba/edit_fperm.cgi
index dadc23b8a..247c7d13a 100755
--- a/samba/edit_fperm.cgi
+++ b/samba/edit_fperm.cgi
@@ -42,6 +42,9 @@ print &ui_table_row($text{'fperm_forcegrp'},
 print &ui_table_row($text{'fperm_link'},
 	&yesno_input("wide links"));
 
+print &ui_table_row($text{'fperm_unix'},
+	&yesno_input("unix extensions"));
+
 print &ui_table_row($text{'fperm_delro'},
 	&yesno_input("delete readonly"));
 
diff --git a/samba/lang/en b/samba/lang/en
index 0eb33dbf4..1abf51d02 100644
--- a/samba/lang/en
+++ b/samba/lang/en
@@ -241,6 +241,7 @@ fperm_notlist=Directories not to list
 fperm_forceuser=Force Unix user
 fperm_forcegrp=Force Unix group
 fperm_link=Allow symlinks outside share?
+fperm_unix=Allow use of Unix extensions?
 fperm_delro=Can delete readonly files?
 fperm_forcefile=Force Unix file mode
 fperm_forcedir=Force Unix directory mode
diff --git a/samba/samba-lib.pl b/samba/samba-lib.pl
index f5a1bf775..46858602a 100755
--- a/samba/samba-lib.pl
+++ b/samba/samba-lib.pl
@@ -508,6 +508,7 @@ foreach $s (@synon) {
 			"socket options","TCP_NODELAY",
 			"strict locking","no",
 			"sync always","no",
+			"unix extensions","yes",
 			"unix password sync","no",
 			"user",undef,
 			"valid chars",undef,
diff --git a/samba/save_fperm.cgi b/samba/save_fperm.cgi
index 2e0163fdd..ca15879a1 100755
--- a/samba/save_fperm.cgi
+++ b/samba/save_fperm.cgi
@@ -26,6 +26,7 @@ $in{create_mode} =~ /^0?[0-7]{3}$/ ||
 &setval("force user", $in{force_user});
 &setval("force group", $in{force_group});
 &setval("wide links", $in{wide_links});
+&setval("unix extensions", $in{unix_extensions});
 
 &modify_share($in{old_name}, $in{old_name});
 &unlock_file($config{'smb_conf'});