diff --git a/.gitignore b/.gitignore
index 7811a2e..e56aea1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/man-pages-posix-2003-a.tar.bz2
-/man-pages-additional-20120910.tar.xz
+/man-pages-posix-2003-a.tar.xz
+/man-pages-additional-20120911.tar.xz
 /man-pages-3.42.tar.xz
diff --git a/man-pages-2.51-nscd-conf.patch b/man-pages-2.51-nscd-conf.patch
deleted file mode 100644
index 429c3dc..0000000
--- a/man-pages-2.51-nscd-conf.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Document max-db-size and auto-propagate in nscd.conf.
-
-The code for nscd is available at:
-http://sourceware.org/cgi-bin/cvsweb.cgi/libc/nscd/?cvsroot=glibc
-
-The two new options are used in the default nscd.conf, introduced in
-revisions 1.11 and 1.12.  See:
-http://sourceware.org/cgi-bin/cvsweb.cgi/libc/nscd/nscd.conf.diff?r1=1.10&r2=1.12&cvsroot=glibc
-
-See also the parser code for `nscd.conf', in `nscd/nscd_conf.c'.
-To see how the max-db-size is used, grep `nscd/mem.c' for
-`max_db_size'.
-To se the actual usage of `auto-propagate', grep `nscd/pwdcache.c' and
-`nscd/grpcache.c' for `propagate'.
-
-A news entry where Ulrich Drepper announces the `auto-propagate'
-option:
-http://sourceware.org/ml/libc-alpha/2006-09/msg00065.html
-
-
-diff -up man-pages-3.04/man5/nscd.conf.5.BAD man-pages-3.04/man5/nscd.conf.5
---- man-pages-3.04/man5/nscd.conf.5.BAD	2008-08-07 17:02:57.000000000 -0400
-+++ man-pages-3.04/man5/nscd.conf.5	2008-08-07 17:04:02.000000000 -0400
-@@ -183,6 +183,25 @@ is shared with the clients so
- that they can directly search in them instead of having to ask the
- daemon over the socket each time a lookup is performed.
- .RE
-+
-+.B max-db-size
-+.I service
-+.I number-of-bytes
-+.RS
-+The maximum allowable size for the service.
-+.RE
-+
-+.B auto-propagate
-+.I service
-+.I <yes|no>
-+.RS
-+When set to
-+.IR no " for " passwd " or " group " service, then the " .byname
-+requests are not added to
-+.IR passwd.byuid " or " group.bygid
-+cache.
-+This may help for tables containing multiple records for the same id.
-+.RE
- .SH "SEE ALSO"
- .BR nscd (8)
- .\" .SH AUTHOR
diff --git a/man-pages-2.63-unimplemented.patch b/man-pages-2.63-unimplemented.patch
deleted file mode 100644
index 3979350..0000000
--- a/man-pages-2.63-unimplemented.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- man-pages-2.63/man2/unimplemented.2.pom	2007-06-29 20:18:40.000000000 +0200
-+++ man-pages-2.63/man2/unimplemented.2	2007-08-01 13:06:51.000000000 +0200
-@@ -26,8 +26,9 @@
- .\"
- .TH UNIMPLEMENTED 2 2007-07-05 "Linux" "Linux Programmer's Manual"
- .SH NAME
--afs_syscall, break, ftime, getpmsg, gtty, lock, madvise1, mpx, prof, profil,
--putpmsg, security, stty, tuxcall, ulimit, vserver \- unimplemented system calls
-+afs_syscall, break, ftime, getpmsg, gtty, lock, madvise1, mpx, 
-+multiplexer, prof, profil, putpmsg, security, stty, tuxcall, ulimit, 
-+vserver \- unimplemented system calls
- .SH SYNOPSIS
- Unimplemented system calls.
- .SH DESCRIPTION
diff --git a/man-pages-2.78-stream.patch b/man-pages-2.78-stream.patch
deleted file mode 100644
index e4bbe83..0000000
--- a/man-pages-2.78-stream.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -up man-pages-2.78/man2/getmsg.2.pom man-pages-2.78/man2/getmsg.2
---- man-pages-2.78/man2/getmsg.2.pom	2008-03-07 12:03:52.000000000 +0100
-+++ man-pages-2.78/man2/getmsg.2	2008-03-07 12:04:04.000000000 +0100
-@@ -0,0 +1 @@
-+.so man2/unimplemented.2
-diff -up man-pages-2.78/man2/putmsg.2.pom man-pages-2.78/man2/putmsg.2
---- man-pages-2.78/man2/putmsg.2.pom	2008-03-07 12:03:52.000000000 +0100
-+++ man-pages-2.78/man2/putmsg.2	2008-03-07 12:04:12.000000000 +0100
-@@ -0,0 +1 @@
-+.so man2/unimplemented.2
-diff -up man-pages-2.78/man2/fattch.2.pom man-pages-2.78/man2/fattch.2
---- man-pages-2.78/man2/fattch.2.pom	2008-03-07 12:03:52.000000000 +0100
-+++ man-pages-2.78/man2/fattch.2	2008-03-07 12:03:38.000000000 +0100
-@@ -0,0 +1 @@
-+.so man2/unimplemented.2
-diff -up man-pages-2.78/man2/isastream.2.pom man-pages-2.78/man2/isastream.2
---- man-pages-2.78/man2/isastream.2.pom	2008-03-07 12:03:52.000000000 +0100
-+++ man-pages-2.78/man2/isastream.2	2008-03-07 12:04:08.000000000 +0100
-@@ -0,0 +1 @@
-+.so man2/unimplemented.2
-diff -up man-pages-2.78/man2/fdetach.2.pom man-pages-2.78/man2/fdetach.2
---- man-pages-2.78/man2/fdetach.2.pom	2008-03-07 12:03:52.000000000 +0100
-+++ man-pages-2.78/man2/fdetach.2	2008-03-07 12:04:00.000000000 +0100
-@@ -0,0 +1 @@
-+.so man2/unimplemented.2
-diff -up man-pages-2.78/man2/unimplemented.2.pom man-pages-2.78/man2/unimplemented.2
---- man-pages-2.78/man2/unimplemented.2.pom	2008-02-28 10:58:27.000000000 +0100
-+++ man-pages-2.78/man2/unimplemented.2	2008-03-07 12:08:41.000000000 +0100
-@@ -26,9 +26,10 @@
- .\"
- .TH UNIMPLEMENTED 2 2007-07-05 "Linux" "Linux Programmer's Manual"
- .SH NAME
--afs_syscall, break, ftime, getpmsg, gtty, lock, madvise1, mpx, 
--multiplexer, prof, profil, putpmsg, security, stty, tuxcall, ulimit, 
--vserver \- unimplemented system calls
-+afs_syscall, break, fattach, fdetach, ftime, getmsg,  getpmsg, gtty, 
-+isastream, lock, madvise1, mpx, multiplexer, prof, profil, putmsg, 
-+putpmsg, security, stty, tuxcall, ulimit, vserver 
-+\- unimplemented system calls
- .SH SYNOPSIS
- Unimplemented system calls.
- .SH DESCRIPTION
diff --git a/man-pages-3.23-ld.so.patch b/man-pages-3.23-ld.so.patch
index 37fe58b..e7719f5 100644
--- a/man-pages-3.23-ld.so.patch
+++ b/man-pages-3.23-ld.so.patch
@@ -1,17 +1,19 @@
-diff -up man-pages-3.24/man3/strcpy.3.pom man-pages-3.24/man3/strcpy.3
-diff -up man-pages-3.24/man8/ld.so.8.pom man-pages-3.24/man8/ld.so.8
---- man-pages-3.24/man8/ld.so.8.pom	2010-02-26 05:46:55.000000000 +0100
-+++ man-pages-3.24/man8/ld.so.8	2010-03-02 10:17:34.000000000 +0100
-@@ -325,11 +325,7 @@ If set to a nonempty string,
+diff -ur man-pages-3.42.orig/man8/ld.so.8 man-pages-3.42/man8/ld.so.8
+--- man-pages-3.42.orig/man8/ld.so.8	2012-08-14 00:39:40.000000000 +0200
++++ man-pages-3.42/man8/ld.so.8	2012-09-10 13:41:04.171047153 +0200
+@@ -362,13 +362,9 @@
+ (glibc since 2.1)
+ If set to a nonempty string,
  output symbol versioning information about the
- program if querying information about the program (i.e., either
+-program if querying information about the program (i.e., either
++program if
  .B LD_TRACE_LOADED_OBJECTS
 -has been set, or
 -.B \-\-list
 -or
 -.B \-\-verify
 -options have been given to the dynamic linker).
-+has been set.
++variable has been set.
  .TP
  .B LD_WARN
  (ELF only)(glibc since 2.1.3)
diff --git a/man-pages-3.24-getnameinfo.patch b/man-pages-3.24-getnameinfo.patch
deleted file mode 100644
index e34e6d6..0000000
--- a/man-pages-3.24-getnameinfo.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up man-pages-3.24/man3/getnameinfo.3.pom man-pages-3.24/man3/getnameinfo.3
---- man-pages-3.24/man3/getnameinfo.3.pom	2010-02-26 05:46:44.000000000 +0100
-+++ man-pages-3.24/man3/getnameinfo.3	2010-03-19 13:38:37.000000000 +0100
-@@ -12,9 +12,10 @@ getnameinfo \- address-to-name translati
- .B #include <sys/socket.h>
- .B #include <netdb.h>
- .sp
--.BI "int getnameinfo(const struct sockaddr *" "sa" ", socklen_t " "salen" ,
--.BI "                char *" "host" ", size_t " "hostlen" ,
--.BI "                char *" "serv" ", size_t " "servlen" ", int " "flags" );
-+.BI "int getnameinfo(const struct sockaddr *restrict " "sa" ",
-+.BI "                socklen_t " "salen" ", char *restrict " "host",
-+.BI "                socklen_t " "hostlen" ", char *restrict " "serv" ",
-+.BI "                socklen_t " "servlen" ", int " "flags" );
- .fi
- .sp
- .in -4n
diff --git a/man-pages-3.30-open.patch b/man-pages-3.30-open.patch
deleted file mode 100644
index 5555978..0000000
--- a/man-pages-3.30-open.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -up man-pages-3.30/man2/open.2.pom man-pages-3.30/man2/open.2
---- man-pages-3.30/man2/open.2.pom	2010-11-01 15:55:38.000000000 +0100
-+++ man-pages-3.30/man2/open.2	2010-11-11 12:26:16.000000000 +0100
-@@ -319,11 +319,21 @@ and
- already exists, then
- .BR open ()
- will fail.
--The behavior of
-+On Linux (on kernel 2.6 or later)
- .B O_EXCL
--is undefined if
-+can be used in 
-+.BR open ()
-+without
- .B O_CREAT
--is not specified.
-+if the
-+.I pathname
-+is a block device.
-+If the block device is in use by the system (mounted etc)
-+.BR open ()
-+will fail with 
-+.B EBUSY.
-+Otherwise the behavior is undefined.
-+
- 
- When these two flags are specified, symbolic links are not followed:
- .\" POSIX.1-2001 explicitly requires this behavior.
diff --git a/man-pages-3.30-prctl.patch b/man-pages-3.30-prctl.patch
deleted file mode 100644
index bd247ac..0000000
--- a/man-pages-3.30-prctl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up man-pages-3.30/man2/prctl.2.pom man-pages-3.30/man2/prctl.2
---- man-pages-3.30/man2/prctl.2.pom	2010-11-01 15:55:38.000000000 +0100
-+++ man-pages-3.30/man2/prctl.2	2010-11-18 14:42:50.000000000 +0100
-@@ -236,9 +236,15 @@ After the secure computing mode has been
- the only system calls that the thread is permitted to make are
- .BR read (2),
- .BR write (2),
--.BR _exit (2),
-+.BR sigreturn (2)
- and
--.BR sigreturn (2).
-+.BR _exit (2).
-+In glibc up to version 2.3, the
-+.BR _exit()
-+wrapper function invoked the kernel system call of the same name.
-+Since glibc 2.3, the  wrapper  function
-+invokes
-+.BR exit_group(2).
- Other system calls result in the delivery of a
- .BR SIGKILL
- signal.
diff --git a/man-pages-3.35-readlink3p.patch b/man-pages-3.35-readlink3p.patch
deleted file mode 100644
index a1a0653..0000000
--- a/man-pages-3.35-readlink3p.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up man-pages-3.35/man3p/readlink.3p.tmp man-pages-3.35/man3p/readlink.3p
---- man-pages-3.35/man3p/readlink.3p.tmp	2008-06-05 11:22:12.000000000 +0200
-+++ man-pages-3.35/man3p/readlink.3p	2011-11-11 17:15:22.632800329 +0100
-@@ -96,7 +96,7 @@ named \fB/modules/pass1\fP.
- .sp
- 
- char buf[1024];
--ssizet_t len;
-+ssize_t len;
- \&...
- if ((len = readlink("/modules/pass1", buf, sizeof(buf)-1)) != -1)
-     buf[len] = '\\0';
diff --git a/man-pages-3.42-nscd-conf.patch b/man-pages-3.42-nscd-conf.patch
new file mode 100644
index 0000000..5dbb5ce
--- /dev/null
+++ b/man-pages-3.42-nscd-conf.patch
@@ -0,0 +1,236 @@
+diff -ur man-pages-3.42.orig/man5/nscd.conf.5 man-pages-3.42/man5/nscd.conf.5
+--- man-pages-3.42.orig/man5/nscd.conf.5	2012-08-14 00:39:40.000000000 +0200
++++ man-pages-3.42/man5/nscd.conf.5	2012-09-10 15:38:22.700012862 +0200
+@@ -34,48 +34,91 @@
+ comment; following characters, up to the end of the line,
+ are not interpreted by nscd.
+ 
+-Valid services are \fIpasswd\fP, \fIgroup\fP, or \fIhosts\fP.
++Valid services are \fIpasswd\fP, \fIgroup\fP, \fIhosts\fP, \fIservices\fP
++or \fInetgroup\fP.
+ 
+ .B logfile
+-.I debug-file-name
++.I <file>
+ .RS
+ Specifies name of the file to which debug info should be written.
+ .RE
+ 
+ .B debug-level
+-.I value
++.I <level>
+ .RS
+ Sets the desired debug level.
++The default is 0.
+ .RE
+ 
+ .B threads
+-.I number
++.I <number>
+ .RS
+ This is the number of threads that are started to wait for
+ requests.
+ At least five threads will always be created.
+ .RE
+ 
++.B max-threads
++.I <number>
++.RS
++Specifies the maximum number of threads. The default is 32.
++.RE
++
+ .B server-user
+-.I user
++.I <user>
+ .RS
+ If this option is set, nscd will run as this user and not as root.
+ If a separate cache for every user is used (\-S parameter), this
+ option is ignored.
+ .RE
+ 
++.B stat-user
++.I <user>
++.RS
++Specifies the user who is allowed to request statistics.
++.RE
++
++.B reload-count
++unlimited |
++.I <number>
++.RS
++Limit on the number of times a cached entry gets reloaded without being used
++before it gets removed.
++The default is 5.
++.RE
++
++.B paranoia
++.I <yes|no>
++.RS
++Enabling paranoia mode causes nscd to restart itself periodically.
++The default is no.
++.RE
++
++.B restart-interval
++.I <time>
++.RS
++Sets the restart interval to
++.I time
++seconds
++if periodic restart is enabled by enabling
++.B paranoia
++mode.
++The default is 3600.
++.RE
++
+ .B enable-cache
+-.I service
++.I <service>
+ .I <yes|no>
+ .RS
+ Enables or disables the specified
+ .I service
+ cache.
++The default is no.
+ .RE
+ 
+ .B positive-time-to-live
+-.I service
+-.I value
++.I <service>
++.I <value>
+ .RS
+ Sets the TTL (time-to-live) for positive entries (successful queries)
+ in the specified cache for
+@@ -87,8 +130,8 @@
+ .RE
+ 
+ .B negative-time-to-live
+-.I service
+-.I value
++.I <service>
++.I <value>
+ .RS
+ Sets the TTL (time-to-live) for negative entries (unsuccessful queries)
+ in the specified cache for
+@@ -102,16 +145,17 @@
+ .RE
+ 
+ .B suggested-size
+-.I service
+-.I value
++.I <service>
++.I <value>
+ .RS
+ This is the internal hash table size,
+ .I value
+ should remain a prime number for optimum efficiency.
++The default is 211.
+ .RE
+ 
+ .B check-files
+-.I service
++.I <service>
+ .I <yes|no>
+ .RS
+ Enables or disables checking the file belonging to the specified
+@@ -120,50 +164,14 @@
+ The files are
+ .IR /etc/passwd ,
+ .IR /etc/group ,
++.IR /etc/hosts
+ and
+-.IR /etc/hosts .
+-.RE
+-
+-.B max-threads
+-.I threads
+-.RS
+-Specifies the maximum number of threads to be started.
+-.RE
+-
+-.B stat-user
+-.I username
+-.RS
+-Specifies the user who is allowed to request statistics.
+-.RE
+-
+-.B reload-count
+-unlimited |
+-.I number
+-.RS
+-Limit on the number of times a cached entry gets reloaded without being used
+-before it gets removed.
+-The default is 5.
+-.RE
+-
+-.B paranoia
+-.I <yes|no>
+-.RS
+-Enabling paranoia mode causes nscd to restart itself periodically.
+-.RE
+-
+-.B restart-interval
+-.I time
+-.RS
+-Sets the restart interval to
+-.I time
+-seconds
+-if periodic restart is enabled by enabling
+-.B paranoia
+-mode.
++.IR /etc/services .
++The default is yes.
+ .RE
+ 
+ .B persistent
+-.I service
++.I <service>
+ .I <yes|no>
+ .RS
+ Keep the content of the cache for
+@@ -171,10 +179,11 @@
+ over server restarts; useful when
+ .B paranoia
+ mode is set.
++The default is no.
+ .RE
+ 
+ .B shared
+-.I service
++.I <service>
+ .I <yes|no>
+ .RS
+ The memory mapping of the nscd databases for
+@@ -182,7 +191,32 @@
+ is shared with the clients so
+ that they can directly search in them instead of having to ask the
+ daemon over the socket each time a lookup is performed.
++The default is no.
++.RE
++
++.B max-db-size
++.I <service>
++.I <bytes>
++.RS
++The maximum allowable size of the database files in bytes for the
++.IR service .
++The default is 33554432.
+ .RE
++
++.B auto-propagate
++.I <service>
++.I <yes|no>
++.RS
++When set to
++.IR no " for " passwd " or " group " service, then the " .byname
++requests are not added to
++.IR passwd.byuid " or " group.bygid
++cache.
++This can help with tables containing multiple records for the same id.
++The default is yes. This option is valid only for services
++.IR passwd " and " group ".
++.RE
++
+ .SH "SEE ALSO"
+ .BR nscd (8)
+ .\" .SH AUTHOR
diff --git a/man-pages-3.42-unimplemented.patch b/man-pages-3.42-unimplemented.patch
new file mode 100644
index 0000000..1d84a44
--- /dev/null
+++ b/man-pages-3.42-unimplemented.patch
@@ -0,0 +1,45 @@
+diff -urN man-pages-3.42.orig/man2/fattch.2 man-pages-3.42/man2/fattch.2
+--- man-pages-3.42.orig/man2/fattch.2	1970-01-01 01:00:00.000000000 +0100
++++ man-pages-3.42/man2/fattch.2	2012-09-10 14:47:02.298948998 +0200
+@@ -0,0 +1 @@
++.so man2/unimplemented.2
+diff -urN man-pages-3.42.orig/man2/fdetach.2 man-pages-3.42/man2/fdetach.2
+--- man-pages-3.42.orig/man2/fdetach.2	1970-01-01 01:00:00.000000000 +0100
++++ man-pages-3.42/man2/fdetach.2	2012-09-10 14:47:02.337948644 +0200
+@@ -0,0 +1 @@
++.so man2/unimplemented.2
+diff -urN man-pages-3.42.orig/man2/getmsg.2 man-pages-3.42/man2/getmsg.2
+--- man-pages-3.42.orig/man2/getmsg.2	1970-01-01 01:00:00.000000000 +0100
++++ man-pages-3.42/man2/getmsg.2	2012-09-10 14:47:02.297949014 +0200
+@@ -0,0 +1 @@
++.so man2/unimplemented.2
+diff -urN man-pages-3.42.orig/man2/isastream.2 man-pages-3.42/man2/isastream.2
+--- man-pages-3.42.orig/man2/isastream.2	1970-01-01 01:00:00.000000000 +0100
++++ man-pages-3.42/man2/isastream.2	2012-09-10 14:47:02.336948651 +0200
+@@ -0,0 +1 @@
++.so man2/unimplemented.2
+diff -urN man-pages-3.42.orig/man2/multiplexer.2 man-pages-3.42/man2/multiplexer.2
+--- man-pages-3.42.orig/man2/multiplexer.2	1970-01-01 01:00:00.000000000 +0100
++++ man-pages-3.42/man2/multiplexer.2	2012-09-10 14:47:02.000000000 +0200
+@@ -0,0 +1 @@
++.so man2/unimplemented.2
+diff -urN man-pages-3.42.orig/man2/putmsg.2 man-pages-3.42/man2/putmsg.2
+--- man-pages-3.42.orig/man2/putmsg.2	1970-01-01 01:00:00.000000000 +0100
++++ man-pages-3.42/man2/putmsg.2	2012-09-10 14:47:02.297949014 +0200
+@@ -0,0 +1 @@
++.so man2/unimplemented.2
+diff -urN man-pages-3.42.orig/man2/unimplemented.2 man-pages-3.42/man2/unimplemented.2
+--- man-pages-3.42.orig/man2/unimplemented.2	2012-08-14 00:39:36.000000000 +0200
++++ man-pages-3.42/man2/unimplemented.2	2012-09-10 14:55:57.738804547 +0200
+@@ -26,8 +26,9 @@
+ .\"
+ .TH UNIMPLEMENTED 2 2007-07-05 "Linux" "Linux Programmer's Manual"
+ .SH NAME
+-afs_syscall, break, ftime, getpmsg, gtty, lock, madvise1, mpx, prof, profil,
+-putpmsg, security, stty, tuxcall, ulimit, vserver \- unimplemented system calls
++afs_syscall, break, fattch, fdetach, ftime, getmsg, getpmsg, gtty, isastream,
++lock, madvise1, mpx, multiplexer, prof, profil, putmsg, putpmsg, security,
++stty, tuxcall, ulimit, vserver \- unimplemented system calls
+ .SH SYNOPSIS
+ Unimplemented system calls.
+ .SH DESCRIPTION
diff --git a/man-pages-posix-2003-awk.patch b/man-pages-posix-2003-awk.patch
index cc637d6..8cc6f55 100644
--- a/man-pages-posix-2003-awk.patch
+++ b/man-pages-posix-2003-awk.patch
@@ -1,7 +1,7 @@
-diff -up man-pages-3.35/man1p/awk.1p.tmp man-pages-3.35/man1p/awk.1p
---- man-pages-3.35/man1p/awk.1p.tmp	2008-06-05 11:22:12.000000000 +0200
-+++ man-pages-3.35/man1p/awk.1p	2011-11-11 17:56:08.350534255 +0100
-@@ -2197,7 +2197,7 @@ necessary to use parentheses to enforce 
+diff -ur man-pages-3.42.orig/man-pages-posix-2003-a/man1p/awk.1p man-pages-3.42/man-pages-posix-2003-a/man1p/awk.1p
+--- man-pages-3.42.orig/man-pages-posix-2003-a/man1p/awk.1p	2008-06-05 11:22:12.000000000 +0200
++++ man-pages-3.42/man-pages-posix-2003-a/man1p/awk.1p	2012-09-11 10:53:09.542957878 +0200
+@@ -2197,7 +2197,7 @@
  .LP
  The \fIawk\fP program specified in the command line is most easily
  specified within single-quotes (for example,
diff --git a/man-pages-posix-2003-man.patch b/man-pages-posix-2003-man.patch
index 1f5aef0..8e6cf5a 100644
--- a/man-pages-posix-2003-man.patch
+++ b/man-pages-posix-2003-man.patch
@@ -1,7 +1,7 @@
-diff -up man-pages-3.29/man1p/man.1p.pom man-pages-3.29/man1p/man.1p
---- man-pages-3.29/man1p/man.1p.pom	2008-06-05 11:22:12.000000000 +0200
-+++ man-pages-3.29/man1p/man.1p	2010-10-22 13:35:55.000000000 +0200
-@@ -44,10 +44,7 @@ command: 
+diff -ur man-pages-3.42.orig/man-pages-posix-2003-a/man1p/man.1p man-pages-3.42/man-pages-posix-2003-a/man1p/man.1p
+--- man-pages-3.42.orig/man-pages-posix-2003-a/man1p/man.1p	2008-06-05 11:22:12.000000000 +0200
++++ man-pages-3.42/man-pages-posix-2003-a/man1p/man.1p	2012-09-11 10:55:29.899852315 +0200
+@@ -44,10 +44,7 @@
  .RS
  .nf
  
@@ -13,4 +13,3 @@ diff -up man-pages-3.29/man1p/man.1p.pom man-pages-3.29/man1p/man.1p
  .fi
  .RE
  .LP
-
diff --git a/man-pages-posix-2003-printf.patch b/man-pages-posix-2003-printf.patch
index bf03f2a..56f5dd8 100644
--- a/man-pages-posix-2003-printf.patch
+++ b/man-pages-posix-2003-printf.patch
@@ -1,7 +1,7 @@
-diff -up man-pages-3.29/man1p/printf.1p.ppp man-pages-3.29/man1p/printf.1p
---- man-pages-3.29/man1p/printf.1p.ppp	2008-06-05 11:22:12.000000000 +0200
-+++ man-pages-3.29/man1p/printf.1p	2010-10-22 15:33:14.000000000 +0200
-@@ -144,7 +144,8 @@ octal number that shall be converted to 
+diff -ur man-pages-3.42.orig/man-pages-posix-2003-a/man1p/printf.1p man-pages-3.42/man-pages-posix-2003-a/man1p/printf.1p
+--- man-pages-3.42.orig/man-pages-posix-2003-a/man1p/printf.1p	2008-06-05 11:22:12.000000000 +0200
++++ man-pages-3.42/man-pages-posix-2003-a/man1p/printf.1p	2012-09-11 10:56:23.003676775 +0200
+@@ -144,7 +144,8 @@
  numeric value specified by the octal number
  .LP
  .IP " *" 3
diff --git a/man-pages-posix-2003-readlink3p.patch b/man-pages-posix-2003-readlink3p.patch
new file mode 100644
index 0000000..e350c81
--- /dev/null
+++ b/man-pages-posix-2003-readlink3p.patch
@@ -0,0 +1,12 @@
+diff -ur man-pages-3.42.orig/man-pages-posix-2003-a/man3p/readlink.3p man-pages-3.42/man-pages-posix-2003-a/man3p/readlink.3p
+--- man-pages-3.42.orig/man-pages-posix-2003-a/man3p/readlink.3p	2008-06-05 11:22:12.000000000 +0200
++++ man-pages-3.42/man-pages-posix-2003-a/man3p/readlink.3p	2012-09-11 10:57:03.913771772 +0200
+@@ -96,7 +96,7 @@
+ .sp
+ 
+ char buf[1024];
+-ssizet_t len;
++ssize_t len;
+ \&...
+ if ((len = readlink("/modules/pass1", buf, sizeof(buf)-1)) != -1)
+     buf[len] = '\\0';
diff --git a/man-pages.spec b/man-pages.spec
index 123c0e8..f01263c 100644
--- a/man-pages.spec
+++ b/man-pages.spec
@@ -1,133 +1,142 @@
-%define posix_version 2003
-%define posix_release a
+%global posix_version 2003
+%global posix_release a
+%global posix_name man-pages-posix-%{posix_version}-%{posix_release}
+%global additional_version 20120911
 
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
 Version: 3.42
 Release: 1%{?dist}
-License: GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE
+License: GPL+ and GPLv2+ and BSD and MIT and Copyright only and IEEE
 Group: Documentation
-URL: http://man7.org/linux/man-pages/
-Source0: http://man7.org/linux/man-pages/download/man-pages-%{version}.tar.xz
+URL: http://www.kernel.org/doc/man-pages/
+Source: http://www.kernel.org/pub/linux/docs/man-pages/man-pages-%{version}.tar.xz
 # POSIX man pages
-Source1: http://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/man-pages-posix-%{posix_version}-%{posix_release}.tar.bz2
+Source1: http://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/%{posix_name}.tar.xz
 # additional man-pages, the source tarball is fedora only
-# all man-pages have a license info
-Source2: man-pages-additional-20120910.tar.xz
-Patch28: man-pages-2.46-nscd.patch
-Patch36: man-pages-2.63-unimplemented.patch
-Patch46: man-pages-2.51-nscd-conf.patch
+Source2: man-pages-additional-%{additional_version}.tar.xz
+
+## Patches ##
+
+# POSIX man pages
+Patch00: man-pages-posix-2003-awk.patch
+Patch01: man-pages-posix-2003-man.patch
+Patch02: man-pages-posix-2003-printf.patch
+# resolves: #723578
+Patch03: man-pages-posix-2003-readlink3p.patch
+
 # Declined by upstream
-Patch53: man-pages-2.78-stream.patch
-Patch57: man-pages-3.22-nsswitch.conf.patch
-Patch59: man-pages-3.23-ld.so.patch
-Patch60: man-pages-3.22-sched_setaffinity.patch
-# Declined by upstream
-Patch63: man-pages-3.24-getnameinfo.patch
-Patch71: man-pages-posix-2003-awk.patch
-Patch72: man-pages-posix-2003-man.patch
-Patch73: man-pages-posix-2003-printf.patch
-#Resolves: #647269, # Declined by upstream
-Patch75: man-pages-3.30-prctl.patch
-#Resolves: #652870
-Patch76: man-pages-3.32-strtol.patch
-#resolves: #681781
-Patch80: man-pages-3.35-printf.patch
-#resolves: #698149
-Patch82: man-pages-3.32-host.patch
-#resolves: #723578
-Patch84: man-pages-3.35-readlink3p.patch
-#Resolves: #655961
-Conflicts: quota < 3.17-14
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# resolves #436407 + multiplexer.2
+Patch20: man-pages-3.42-unimplemented.patch
+
+# Were not / Waiting to be upstreamed
+Patch40: man-pages-2.46-nscd.patch
+# resolves: #522761
+Patch41: man-pages-3.22-nsswitch.conf.patch
+Patch42: man-pages-3.22-sched_setaffinity.patch
+# resolves: #532629
+Patch43: man-pages-3.23-ld.so.patch
+# resolves: #698149
+Patch44: man-pages-3.32-host.patch
+# resolves: #652870
+Patch45: man-pages-3.32-strtol.patch
+# resolves: #681781
+Patch46: man-pages-3.35-printf.patch
+# resolves: #566303, #835679, #840805
+Patch47: man-pages-3.42-nscd-conf.patch
+
+
 Autoreq: false
 BuildArch: noarch
+# resolves: #655961
+Conflicts: quota < 3.17-14
 
 %description
 A large collection of man pages (documentation) from the Linux
 Documentation Project (LDP).
 
 %prep
-%setup -q -n %{name}-%{version} -a 1 -a 2
+%setup -q -a 1 -a 2
 
-mv man-pages-posix-%{posix_version}-%{posix_release}/Changes{,.posix}
-mv man-pages-posix-%{posix_version}-%{posix_release}/* ./
-rmdir man-pages-posix-%{posix_version}-%{posix_release}
-%patch28 -p1
-%patch36 -p1
+%patch00 -p1
+%patch01 -p1
+%patch02 -p1
+%patch03 -p1
+
+%patch20 -p1
+
+%patch40 -p1
+%patch41 -p1
+%patch42 -p1
+%patch43 -p1
+%patch44 -p1
+%patch45 -p1
 %patch46 -p1
-%patch53 -p1
-%patch57 -p1
-%patch59 -p1
-%patch60 -p1
-%patch63 -p1
-%patch71 -p1
-%patch72 -p1
-%patch73 -p1
-%patch75 -p1
-%patch76 -p1
-%patch80 -p1
-%patch82 -p1
-%patch84 -p1
+%patch47 -p1
 
-### And now remove those we are not going to use:
+## Remove man pages we are not going to use ##
 
-# Part of libattr-devel
-rm -v man2/{,f,l}{get,list,remove,set}xattr.2
+# part of libattr-devel
+rm man2/{,f,l}{get,list,remove,set}xattr.2
 
-# Problem with db x db4 (#198597) - man pages are obsolete
-rm -v man3/{db,btree,dbopen,hash,mpool,recno}.3
+# problem with db x db4 (#198597) - man pages are obsolete
+rm man3/{db,btree,dbopen,hash,mpool,recno}.3
+
+# deprecated
+rm man2/pciconfig_{write,read,iobase}.2
 
-# Deprecated
-rm -v man2/pciconfig_{write,read,iobase}.2
 
 %build
-: Nothing to build.
-
+# nothing to build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
+%{__mv} %{posix_name}/man?p .
 instdir=$RPM_BUILD_ROOT%{_mandir}
-for sec in 0p 1 1p 2 3 3p 4 5 6 7 8 9; do
-  mkdir -p $instdir{,/en}/man$sec
-  for f in man$sec/*.$sec; do
-    case $f in
-      man$sec/'*'.$sec)
-	# this dir is empty
-	continue ;;
-      man7/iso_8859-*.7)
-	enc=${f#man7/}
-	enc=${enc%.7}
-	enc=ISO-${enc#iso_}
-	LANG=en iconv -f $enc -t utf-8 $f | sed -e '1s/coding: *[^ ]* /coding: UTF-8 /' > $instdir/$f ;;
-      man7/koi8-*.7 | man7/armscii-8.7 | man7/cp1251.7)
-	enc=${f#man7/}
-	enc=${enc%.7}
-	LANG=en iconv -f $enc -t utf-8 $f | sed -e '1s/coding: *[^ ]* /coding: UTF-8 /' > $instdir/$f ;;
-      *)
-	LANG=en iconv -f latin1 -t utf-8 -o $instdir/en/$f $f
-	LANG=en iconv -f utf-8 -t ascii//translit -o $instdir/$f $instdir/en/$f
-	cmp -s $instdir/$f $instdir/en/$f &&
-	  rm $instdir/en/$f ;;
-    esac
-  done
+for sec in 0p 1 1p 2 3 3p 4 5 6 7 8; do
+    %{__mkdir} -p $instdir{,/en}/man$sec
+    for f in man$sec/*.$sec; do
+        case $f in
+            man$sec/'*'.$sec)
+                # this dir is empty
+                continue
+                ;;
+            man7/iso_8859-*.7)
+                enc=ISO-8859-15
+                LANG=en iconv -f $enc -t utf-8 $f | \
+                    %{__sed} -e '1s/coding: *[^ ]* /coding: UTF-8 /' > $instdir/$f
+                ;;
+            man7/koi8-*.7 | man7/armscii-8.7 | man7/cp1251.7)
+                enc=${f#man7/}
+                enc=${enc%.7}
+                LANG=en iconv -f $enc -t utf-8 $f | \
+                    %{__sed} -e '1s/coding: *[^ ]* /coding: UTF-8 /' > $instdir/$f
+                ;;
+            *)
+                LANG=en iconv -f latin1 -t utf-8 -o $instdir/en/$f $f
+                LANG=en iconv -f utf-8 -t ascii//translit -o $instdir/$f $instdir/en/$f
+                cmp -s $instdir/$f $instdir/en/$f && %{__rm} $instdir/en/$f
+                ;;
+        esac
+    done
 done
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+cd %{posix_name}
+%{__mv} Changes %{posix_name}.Changes
+%{__mv} README %{posix_name}.README
+cd ..
 
 %files
-%defattr(0644,root,root,0755)
-%doc README man-pages-%{version}.Announce POSIX-COPYRIGHT
+%doc README man-pages-%{version}.Announce Changes %{posix_name}/POSIX-COPYRIGHT %{posix_name}/%{posix_name}.{README,Announce,Changes}
 %{_mandir}/man*/*
 %lang(en) %{_mandir}/en/man*/*
 
 %changelog
-* Mon Sep 10 2012 Peter Schiffer <pschiffe@redhat.com> - 3.42-1
+* Tue Sep 11 2012 Peter Schiffer <pschiffe@redhat.com> - 3.42-1
 - resolves: #847941
   update to 3.42
 - updated additional man pages
+- cleaned patches
+- cleaned .spec file, fixed minor encoding issue
 
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.41-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 9cc0d52..679ea79 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-7c78aff03c0a6767ba483d34f19e4b09  man-pages-posix-2003-a.tar.bz2
-42d012251e71919a6811932cafbec537  man-pages-additional-20120910.tar.xz
+ec0a97ccb2ff9e4c32fac67111dbc99a  man-pages-posix-2003-a.tar.xz
+74e040526c0497f8145925890aa39abb  man-pages-additional-20120911.tar.xz
 2392bb23db94f344f493c4beca41398f  man-pages-3.42.tar.xz