diff -Nur e-smith-samba-2.6.0.old/root/etc/e-smith/db/configuration/migrate/31smbDisplayCharset e-smith-samba-2.6.0/root/etc/e-smith/db/configuration/migrate/31smbDisplayCharset
--- e-smith-samba-2.6.0.old/root/etc/e-smith/db/configuration/migrate/31smbDisplayCharset	1969-12-31 19:00:00.000000000 -0500
+++ e-smith-samba-2.6.0/root/etc/e-smith/db/configuration/migrate/31smbDisplayCharset	2016-04-12 06:39:05.846000000 -0400
@@ -0,0 +1,7 @@
+{
+        # Display Charset has been dropped in Samba 4
+        my $a = $DB->get("smb") or return;
+        return unless (exists $smb{'DisplayCharSet'});
+        $DB->get_prop_and_delete('smb', 'DisplayCharSet');
+}
+
diff -Nur e-smith-samba-2.6.0.old/root/etc/e-smith/templates/etc/smb.conf/11displayCharSet e-smith-samba-2.6.0/root/etc/e-smith/templates/etc/smb.conf/11displayCharSet
--- e-smith-samba-2.6.0.old/root/etc/e-smith/templates/etc/smb.conf/11displayCharSet	2005-02-18 10:25:17.000000000 -0500
+++ e-smith-samba-2.6.0/root/etc/e-smith/templates/etc/smb.conf/11displayCharSet	1969-12-31 19:00:00.000000000 -0500
@@ -1,5 +0,0 @@
-{
-    my $DisplayCharSet = $smb{DisplayCharSet} || "ISO8859-1";
-
-    "display charset = $DisplayCharSet";
-}