diff -u -r samba-3.0.0beta3.orig/packaging/RedHat/samba.log samba-3.0.0beta3/packaging/RedHat/samba.log
--- samba-3.0.0beta3.orig/packaging/RedHat/samba.log	2003-07-28 17:27:06.000000000 -0400
+++ samba-3.0.0beta3/packaging/RedHat/samba.log	2003-07-28 17:57:39.000000000 -0400
@@ -1,10 +1,10 @@
-/var/log/samba/log.nmbd {
+/var/log/samba/nmbd.log {
     postrotate
 	/usr/bin/killall -HUP nmbd
     endscript
 }
 
-/var/log/samba/log.smbd {
+/var/log/samba/smbd.log {
     postrotate
 	/usr/bin/killall -HUP smbd
     endscript
diff -u -r samba-3.0.0beta3.orig/source/lib/popt_common.c samba-3.0.0beta3/source/lib/popt_common.c
--- samba-3.0.0beta3.orig/source/lib/popt_common.c	2003-07-28 17:27:07.000000000 -0400
+++ samba-3.0.0beta3/source/lib/popt_common.c	2003-07-28 17:56:28.000000000 -0400
@@ -55,7 +55,7 @@
 		pname++;
 
 	if (reason == POPT_CALLBACK_REASON_PRE) {
-		pstr_sprintf(logfile, "%s/log.%s", dyn_LOGFILEBASE, pname);
+		pstr_sprintf(logfile, "%s/%s.log", dyn_LOGFILEBASE, pname);
 		lp_set_logfile(logfile);
 		return;
 	}
@@ -93,7 +93,7 @@
 
 	case 'l':
 		if (arg) {
-			pstr_sprintf(logfile, "%s/log.%s", arg, pname);
+			pstr_sprintf(logfile, "%s/%s.log", arg, pname);
 			lp_set_logfile(logfile);
 		}
 		break;
--- samba-3.0.3pre1/packaging/RedHat/smb.conf.logfiles	2004-03-19 11:26:16.000000000 -0500
+++ samba-3.0.3pre1/packaging/RedHat/smb.conf	2004-03-22 11:54:14.000000000 -0500
@@ -43,9 +43,9 @@
 
 # this tells Samba to use a separate log file for each machine
 # that connects
-   # log file = /var/log/samba/log.%m
+ log file = /var/log/samba/%m.log
 # all log information in one file
-   log file = /var/log/samba/smbd.log
+#   log file = /var/log/samba/smbd.log
 
 # Put a capping on the size of the log files (in Kb).
    max log size = 50
--- samba-3.0.8pre1/source/nmbd/nmbd.c.logfiles	2004-09-22 08:42:14.000000000 -0400
+++ samba-3.0.8pre1/source/nmbd/nmbd.c	2004-09-27 14:16:59.000000000 -0400
@@ -626,7 +626,7 @@
 	sys_srandom(time(NULL) ^ sys_getpid());
 	
 	if (!override_logfile) {
-		slprintf(logfile, sizeof(logfile)-1, "%s/log.nmbd", dyn_LOGFILEBASE);
+		slprintf(logfile, sizeof(logfile)-1, "%s/nmbd.log", dyn_LOGFILEBASE);
 		lp_set_logfile(logfile);
 	}
 	
--- samba-3.0.8pre1/source/nsswitch/winbindd.c.logfiles	2004-09-22 08:42:13.000000000 -0400
+++ samba-3.0.8pre1/source/nsswitch/winbindd.c	2004-09-27 14:17:35.000000000 -0400
@@ -856,7 +856,7 @@
 	}
 
 	if (!override_logfile) {
-		pstr_sprintf(logfile, "%s/log.winbindd", dyn_LOGFILEBASE);
+		pstr_sprintf(logfile, "%s/winbindd.log", dyn_LOGFILEBASE);
 		lp_set_logfile(logfile);
 	}
 	setup_logging("winbindd", log_stdout);
--- samba-3.0.10/docs/htmldocs/Samba-HOWTO-Collection/bugreport.html.logfiles	2004-12-17 21:29:32.000000000 -0500
+++ samba-3.0.10/docs/htmldocs/Samba-HOWTO-Collection/bugreport.html	2004-12-17 21:29:34.000000000 -0500
@@ -46,7 +46,7 @@
 					
 				log level = 10</tt></i></td></tr><tr><td><a class="indexterm" name="id2596722"></a><i class="parameter"><tt>
 					
-				log file = /usr/local/samba/lib/log.%m</tt></i></td></tr><tr><td><a class="indexterm" name="id2596739"></a><i class="parameter"><tt>
+				log file = /usr/local/samba/lib/%m.log</tt></i></td></tr><tr><td><a class="indexterm" name="id2596739"></a><i class="parameter"><tt>
 					
 				include = /usr/local/samba/lib/smb.conf.%m</tt></i></td></tr></table><p>
 and create a file <tt class="filename">/usr/local/samba/lib/smb.conf.<i class="replaceable"><tt>machine</tt></i></tt> where