diff --git a/fetchmail-fix-permissions-doc.patch b/fetchmail-fix-permissions-doc.patch
new file mode 100644
index 0000000..0604613
--- /dev/null
+++ b/fetchmail-fix-permissions-doc.patch
@@ -0,0 +1,22 @@
+# Fixes documentation inconsistency (bnc#174287)
+# This patch will be included in fetchmail-6.3.9 (but not in -rc's)
+--- ./fetchmail.man.orig	2008-10-09 10:56:09.000000000 +0200
++++ ./fetchmail.man	2008-10-09 10:56:47.000000000 +0200
+@@ -794,7 +794,7 @@ Specify a non-default name for the
+ run control file.  The pathname argument must be either "-" (a single
+ dash, meaning to read the configuration from standard input) or a
+ filename.  Unless the \-\-version option is also on, a named file
+-argument must have permissions no more open than 0600 (u=rw,g=,o=) or
++argument must have permissions no more open than 0700 (u=rwx,g=,o=) or
+ else be /dev/null.
+ .TP
+ .B \-i <pathname> | \-\-idfile <pathname>
+@@ -1467,7 +1467,7 @@ When there is a conflict between the com
+ arguments in this file, the command-line arguments take precedence.
+ .PP
+ To protect the security of your passwords,
+-your \fI~/.fetchmailrc\fR may not normally have more than 0600 (u=rw,g=,o=) permissions;
++your \fI~/.fetchmailrc\fR may not normally have more than 0700 (u=rwx,g=,o=) permissions;
+ .I fetchmail
+ will complain and exit otherwise (this check is suppressed when
+ \-\-version is on).
diff --git a/fetchmail.changes b/fetchmail.changes
index 4454770..bac257b 100644
--- a/fetchmail.changes
+++ b/fetchmail.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct  9 11:40:00 CEST 2008 - puzel@suse.cz
+
+- fix documentation inconsistency (bnc#174287)
+- mark /etc/logrotate.d/fetchmail as %config(noreplace)
+
 -------------------------------------------------------------------
 Wed Oct  1 13:15:25 CEST 2008 - puzel@suse.cz
 
diff --git a/fetchmail.spec b/fetchmail.spec
index 34545bf..3cc1255 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -27,12 +27,13 @@ License:        GPL v2 or later; Other uncritical OpenSource License; Public Dom
 Group:          Productivity/Networking/Email/Utilities
 AutoReqProv:    on
 Version:        6.3.8.90
-Release:        10
+Release:        11
 Source:         %{name}-6.3.9-rc2.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.logrotate
 Source3:        sysconfig.%{name}
 Patch:          fetchmail-6.3.8-smtp_errors.patch
+Patch1:         fetchmail-fix-permissions-doc.patch
 PreReq:         %insserv_prereq %fillup_prereq coreutils pwdutils
 Url:            http://fetchmail.berlios.de/
 Icon:	        fetchmail.xpm
@@ -85,6 +86,7 @@ Authors:
 %prep
 %setup -q -n fetchmail-6.3.9-rc2
 %patch -p1
+%patch1
 cp -a %{S:1} %{S:2} %{S:3} .
 
 %build
@@ -158,7 +160,7 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %attr (0600, fetchmail, root) %{_localstatedir}/log/fetchmail
 %doc %{_mandir}/man1/fetchmail.1.gz
 %ghost %config(noreplace) %attr (0600, fetchmail, root) %{_sysconfdir}/fetchmailrc
-/etc/logrotate.d/fetchmail
+%config(noreplace) /etc/logrotate.d/fetchmail
 /etc/init.d/fetchmail
 /sbin/rcfetchmail
 /var/adm/fillup-templates/sysconfig.%{name}
@@ -170,6 +172,9 @@ rm -rf $RPM_BUILD_ROOT
 %{py_sitedir}/fetchmailconf.*
 
 %changelog
+* Thu Oct 09 2008 puzel@suse.cz
+- fix documentation inconsistency (bnc#174287)
+- mark /etc/logrotate.d/fetchmail as %%config(noreplace)
 * Wed Oct 01 2008 puzel@suse.cz
 - Fix build on SLE9
   - do not build with kerberos support on SLE9