diff -ruN e-smith-base-5.2.0.old/root/usr/lib/perl5/site_perl/esmith/console/configure.pm e-smith-base-5.2.0/root/usr/lib/perl5/site_perl/esmith/console/configure.pm
--- e-smith-base-5.2.0.old/root/usr/lib/perl5/site_perl/esmith/console/configure.pm	2013-06-29 08:41:57.000000000 -0700
+++ e-smith-base-5.2.0/root/usr/lib/perl5/site_perl/esmith/console/configure.pm	2013-06-29 09:02:01.000000000 -0700
@@ -250,16 +250,23 @@
 
     if ($choice =~ /^([a-zA-Z][a-zA-Z0-9\-]*)$/)
     {
-	$db->set_value('SystemName', $SystemName = lc($1));
-	if ($oldSystemName ne $SystemName)
-	{
-        # Delete old static hosts db record if one exists
-        use esmith::HostsDB;
-        my $hdb = esmith::HostsDB->open;
-        my $rec = $hdb->get("$oldSystemName.$DomainName");
-        $rec->delete if $rec;
-	}
-	goto ETHERNET_LOCAL;
+        $db->set_value('SystemName', $SystemName = lc($1));
+        if ($oldSystemName ne $SystemName)
+        {
+            # Delete old static hosts db record if one exists
+            use esmith::HostsDB;
+            my $hdb = esmith::HostsDB->open;
+            my $rec = $hdb->get("$oldSystemName.$DomainName");
+            $rec->delete if $rec;
+        
+            # Update ServerName if was oldSystemName 
+            my $oldServerName = $db->get_prop("smb", "ServerName");
+            if ($oldSystemName eq $oldServerName)
+            {
+                $db->set_prop("smb", "ServerName", $SystemName);
+            }        
+        }
+        goto ETHERNET_LOCAL;
 
     }
     else