diff --git a/tar.1 b/tar.1
index 0b3230c..ee890bf 100644
--- a/tar.1
+++ b/tar.1
@@ -48,7 +48,7 @@ tar \- The GNU version of the tar archiving utility
 .B -C, --directory DIR
 ]
 [
-.B --check-links
+.B -l, --check-links
 ]
 [
 .B --checkpoint
@@ -105,7 +105,7 @@ tar \- The GNU version of the tar archiving utility
 .B --keep-newer-files
 ]
 [
-.B -l, --one-file-system
+.B --one-file-system
 ]
 [
 .B -L, --tape-length N
@@ -156,7 +156,7 @@ tar \- The GNU version of the tar archiving utility
 .B -O, --to-stdout
 ]
 [
-.B --occurrence NUM
+.B --occurrence[=NUM]
 ]
 [
 .B --overwrite
@@ -393,7 +393,7 @@ block the output of compression program for tapes
 .B -C, --directory DIR
 change to directory DIR
 .TP
-.B --check-links
+.B -l, --check-links
 warn if number of hard links to the file on the filesystem mismatch the 
 number of links recorded in the archive
 .TP
@@ -457,7 +457,7 @@ begin at file F in the archive
 .B --keep-newer-files
 do not overwrite files which are newer than the archive
 .TP
-.B -l, --one-file-system
+.B --one-file-system
 stay in local file system when creating an archive
 .TP
 .B -L, --tape-length N
@@ -513,9 +513,10 @@ this behavior when extracting an archive
 .B -O, --to-stdout
 extract files to standard output
 .TP
-.B --occurrence NUM
-process only NUM occurrences of each named file; used with 
-\fI--delete\fR, \fI--diff\fR, \fI--extract\fR, or \fI--list\fR
+.B --occurrence[=NUM]
+process only the NUMth occurrence of each named file; used with
+\fI--delete\fR, \fI--diff\fR, \fI--extract\fR, or \fI--list\fR.
+NUM defaults to 1.
 .TP
 .B --overwrite
 overwrite existing files and directory metadata when extracting
diff --git a/tar.spec b/tar.spec
index 070fd4a..cf47fda 100644
--- a/tar.spec
+++ b/tar.spec
@@ -2,7 +2,7 @@ Summary: A GNU file archiving program
 Name: tar
 Epoch: 2
 Version: 1.17
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
@@ -95,6 +95,12 @@ fi
 %{_infodir}/tar.info*
 
 %changelog
+* Mon Jan 21 2008 Radek Brich <rbrich@redhat.com> 2:1.17-6
+- fix errors in man page
+  * fix definition of --occurrence (bz#416661, patch by Jonathan Wakely)
+  * update meaning of -l: it has changed from --one-filesystem
+    to --check-links (bz#426717)
+
 * Wed Dec 12 2007 Radek Brich <rbrich@redhat.com> 2:1.17-5
 - fix (non)detection of xattrs
 - move configure stuff from -xattrs patch to -xattrs-conf,