diff --git a/chkstat.8 b/chkstat.8
index 5244636..b3f9d2f 100644
--- a/chkstat.8
+++ b/chkstat.8
@@ -1,11 +1,9 @@
 .\"
-.\" S.u.S.E. man page for chkstat
-.\" Copyright (c) 2000-2003 SuSE Linux AG, Nuernberg, Germany.
-.\" please send bugfixes or comments via http://www.suse.de/feedback
+.\" SUSE man page for chkstat
 .\"
 .\" Author: Ruediger Oertel
 .\"
-.TH CHKSTAT 8 "Jul 9, 1998" "Version 0.1" "Tool to check and set file permissions"
+.TH CHKSTAT 8 "2008-04-17" "SUSE Linux" "Tool to check and set file permissions"
 .\"
 .UC 8
 .SH NAME
@@ -18,10 +16,11 @@ chkstat \- Tool to check and set file permissions
 .RB \|[\| \-\-noheader ]
 .RB \|[\|\|[\| \-\-examine\  file\ ] ... ]
 .RB \|[\|\|[\| \-\-files\  filelist\ ] ... ]
+.RB \|[\|\|[\| \-\-root\  directory\ ] ... ]
 .B permission-file ...
 .\"
 .SH DESCRIPTION
-The perl script
+The program
 .I /usr/bin/chkstat
 is a tool to check and set file permissions.
 .PP
@@ -46,6 +45,9 @@ Check permissions for this file and not all files listed in the permissions file
 Check permissions for the files listed in
 .IR filelist
 and not for all files listed in the permissions files.
+.TP
+.IR \-\-root\ directory
+Prefix the files given in the permissions files by this directory.
 .PP
 .SH EXAMPLE
 .PP
@@ -67,8 +69,10 @@ and wildcards are not supported for the filepath. Lines starting
 with '#' and empty lines are treated as comments.
 .SH COPYRIGHT
 1996-2003 SuSE Linux AG, Nuernberg, Germany.
-.SH AUTHOR
-Reinhold Sojer (http:/www.suse.de/feedback)
-.PP
-Useful changes and additions by Tobias Burnus <burnus@gmx.de>
+
+2008 SUSE LINUX Products GmbH
+.SH AUTHORS
+Reinhold Sojer, Ruediger Oertel, Michael Schroeder
+.PP
+Useful changes and additions by Tobias Burnus
 
diff --git a/chkstat.c b/chkstat.c
index 056036b..9e19602 100644
--- a/chkstat.c
+++ b/chkstat.c
@@ -286,6 +286,8 @@ main(int argc, char **argv)
   while (argc > 1)
     {
       opt = argv[1];
+      if (!strcmp(opt, "--"))
+	break;
       if (*opt == '-' && opt[1] == '-')
 	opt++;
       if (!strcmp(opt, "-s") || !strcmp(opt, "-set"))
diff --git a/permissions.changes b/permissions.changes
index 1bcd4e2..afed792 100644
--- a/permissions.changes
+++ b/permissions.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 17 09:45:03 CEST 2008 - lnussel@suse.de
+
+- update chkstat manpage and support '--' argument for chkstat
+  (bnc#57438)
+
 -------------------------------------------------------------------
 Wed Mar 12 13:09:51 CET 2008 - lnussel@suse.de
 
diff --git a/permissions.spec b/permissions.spec
index f75789f..3d941de 100644
--- a/permissions.spec
+++ b/permissions.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package permissions (Version 2008.3.12)
+# spec file for package permissions (Version 2008.4.21)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -15,7 +15,7 @@ Name:           permissions
 License:        GPL v2 or later
 Group:          Productivity/Security
 AutoReqProv:    on
-Version:        2008.3.12
+Version:        2008.4.21
 Release:        1
 Provides:       aaa_base:/etc/permissions
 Requires:       /sbin/SuSEconfig
@@ -84,6 +84,9 @@ install -m 644 %{SOURCE9} $RPM_BUILD_ROOT/etc
 /var/adm/fillup-templates/sysconfig.security
 
 %changelog
+* Thu Apr 17 2008 lnussel@suse.de
+- update chkstat manpage and support '--' argument for chkstat
+  (bnc#57438)
 * Wed Mar 12 2008 lnussel@suse.de
 - new PolicyKit permissions (bnc#295341)
 - remove obsolete entries for scmxx and zapping
@@ -158,7 +161,7 @@ install -m 644 %{SOURCE9} $RPM_BUILD_ROOT/etc
 - add /usr/bin/fusermount (#133657)
 * Mon Nov 21 2005 lnussel@suse.de
 - remove Xwrapper, it's a symlink nowadays (#134611)
-* Wed Nov 02 2005 dmueller@suse.de
+* Thu Nov 03 2005 dmueller@suse.de
 - don't build as root
 * Thu Oct 13 2005 meissner@suse.de
 - nici moved to /var/opt/novell/...
@@ -303,7 +306,7 @@ install -m 644 %{SOURCE9} $RPM_BUILD_ROOT/etc
 * Thu Sep 18 2003 kukuk@suse.de
 - Fix group of straps, popauth and ntping
 - Remove some GNOME games which do not need special rights anymore
-* Tue Sep 16 2003 kukuk@suse.de
+* Wed Sep 17 2003 kukuk@suse.de
 - permissions.easy: change group of bing, vboxbeep, plpnfsd to
   trusted, majordomo/wrapper to daemon
 * Tue Sep 16 2003 kukuk@suse.de