diff --git a/samba.spec b/samba.spec
index c934c1f..535b11d 100644
--- a/samba.spec
+++ b/samba.spec
@@ -565,8 +565,11 @@ exit 0
 %{_libdir}/libsmbclient.a
 
 %changelog
+* Tue Mar 20 2007 Simo Sorce <ssorce@redhat.com> 3.0.24-6.fc7
+- do not put comments inline on smb.conf options, they may be read
+  as part of the value (for example log files names)
+
 * Mon Mar 19 2007 Simo Sorce <ssorce@redhat.com> 3.0.24-5.fc7
-- fix pam_winbindd bug that prevents local users to log in (patch by GD)
 - actually use the correct samba.pamd file not the old samba.pamd.stack file
 - fix logifles and use upstream convention of log.* instead of our old *.log
   Winbindd creates its own log.* files anyway so we will be more consistent
diff --git a/smb.conf.default b/smb.conf.default
index 1c1886c..9933a38 100644
--- a/smb.conf.default
+++ b/smb.conf.default
@@ -52,8 +52,10 @@
 #
 # Max Log Size let you specify the max size log files should reach
 	
-	log file = /var/log/samba/log.%m # logs split per machine
-	max log size = 50 # max 50KB per log file, then rotate
+	# logs split per machine
+	log file = /var/log/samba/log.%m
+	# max 50KB per log file, then rotate
+	max log size = 50
 	
 # ----------------------- Standalone Server Options ------------------------
 #
@@ -108,10 +110,13 @@
 ;	domain master = yes 
 ;	domain logons = yes
 	
-;	logon script = %m.bat # the login script name depends on the machine name
-;	logon script = %u.bat # the login script name depends on the unix user used
+	# the login script name depends on the machine name
+;	logon script = %m.bat
+	# the login script name depends on the unix user used
+;	logon script = %u.bat
 ;	logon path = \\%L\Profiles\%u
-;	logon path =          # disables profiles support by specifing an empty path
+	# disables profiles support by specifing an empty path
+;	logon path =          
 	
 ;	add user script = /usr/sbin/useradd %u
 ;	add group script = /usr/sbin/groupadd %g
@@ -172,7 +177,8 @@
 	cups options = raw
 
 ;	printcap name = /etc/printcap
-;	printcap name = lpstat #obtain list of printers automatically on SystemV
+	#obtain list of printers automatically on SystemV
+;	printcap name = lpstat
 ;	printing = cups
 	
 #============================ Share Definitions ==============================