diff --git a/.cvsignore b/.cvsignore
index c544458..cf09437 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
 man-pages-extralocale.tar.bz2
 man2.tar.gz
-man-pages-2.34.tar.bz2
+man-pages-2.36.tar.bz2
diff --git a/man-pages-2.34-libaio-includes.patch b/man-pages-2.34-libaio-includes.patch
new file mode 100644
index 0000000..9957126
--- /dev/null
+++ b/man-pages-2.34-libaio-includes.patch
@@ -0,0 +1,33 @@
+--- man-pages-1.67/man2/io_submit.2.orig	2006-04-11 10:24:00.000000000 -0400
++++ man-pages-1.67/man2/io_submit.2	2006-04-11 10:24:01.000000000 -0400
+@@ -27,7 +27,7 @@ io_submit \- Submit asynchronous I/O blo
+ .ad l
+ .hy 0
+ 
+-#include <linux/aio.h>
++#include <libaio.h>
+ .sp
+ .HP 16
+ long\ \fBio_submit\fR\ (aio_context_t\ \fIctx_id\fR, long\ \fInr\fR, struct\ iocb\ \fI**iocbpp\fR);
+--- man-pages-1.67/man2/io_getevents.2.orig	2006-04-11 10:24:14.000000000 -0400
++++ man-pages-1.67/man2/io_getevents.2	2006-04-11 10:24:17.000000000 -0400
+@@ -31,7 +31,7 @@ io_getevents \- Read asynchronous I/O ev
+ 
+ .sp
+ 
+-#include <linux/aio.h>
++#include <libaio.h>
+ 
+ .sp
+ .HP 19
+--- man-pages-1.67/man2/io_cancel.2.orig	2006-04-11 10:24:05.000000000 -0400
++++ man-pages-1.67/man2/io_cancel.2	2006-04-11 10:24:09.000000000 -0400
+@@ -27,7 +27,7 @@ io_cancel \- Cancel an outstanding async
+ .ad l
+ .hy 0
+ 
+-#include <linux/aio.h>
++#include <libaio.h>
+ .sp
+ .HP 16
+ long\ \fBio_cancel\fR\ (aio_context_t\ \fIctx_id\fR, struct\ iocb\ \fI*iocb\fR, struct\ io_event\ \fI*result\fR);
diff --git a/man-pages-2.34-nscd.patch b/man-pages-2.34-nscd.patch
new file mode 100644
index 0000000..33206d8
--- /dev/null
+++ b/man-pages-2.34-nscd.patch
@@ -0,0 +1,11 @@
+--- man-pages-2.34/man8/nscd.8.pom	2006-07-14 13:24:02.000000000 +0200
++++ man-pages-2.34/man8/nscd.8	2006-07-18 09:36:08.000000000 +0200
+@@ -47,6 +47,8 @@
+ Note that the shadow file is specifically not cached.
+ .BR getspnam (3)
+ calls remain uncached as a result.
++As a result of this behavior there is not possible to change non-nscd user
++to another non-nscd user via su service when nscd is running.
+ 
+ .SH OPTIONS
+ .TP
diff --git a/man-pages.spec b/man-pages.spec
index 7db3a02..d3f7f7f 100644
--- a/man-pages.spec
+++ b/man-pages.spec
@@ -1,7 +1,7 @@
 Summary: Man (manual) pages from the Linux Documentation Project.
 Name: man-pages
-Version: 2.34
-Release: 3
+Version: 2.36
+Release: 1
 License: distributable
 Group: Documentation
 Source0: http://www.kernel.org/pub/linux/docs/manpages/man-pages-%{version}.tar.bz2
@@ -24,12 +24,15 @@ Patch16: man-pages-2.05-issue.patch
 Patch19: man-pages-2.32-termcap.patch
 Patch20: man-pages-2.13-aio.patch
 Patch21: man-pages-2.32-mmap.patch
-Patch22: man-pages-2.20-nscd.conf.patch
+Patch22: man-pages-1.67-nscd_conf.patch
 Patch23: man-pages-2.25-dbopen.patch
 Patch24: man-pages-2.25-malloc.patch
-Patch25: man-pages-2.29-sigprocmask.patch
 Patch26: man-pages-2.34-inet.patch
 Patch27: man-pages-2.34-typo.patch
+Patch28: man-pages-2.34-nscd.patch
+Patch29: man-pages-2.34-getrlimit.patch
+Patch30: man-pages-2.34-libaio-includes.patch
+Patch31: man-pages-2.34-write.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Autoreq: false
@@ -64,9 +67,12 @@ tar xzf %{SOURCE11}
 %patch22 -p1 
 %patch23 -p1
 %patch24 -p1
-%patch25 -p1
 %patch26 -p1
 %patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1
 
 %build
 
@@ -83,9 +89,9 @@ rm -fv man1/diff.1
 # Part of quota
 rm -fv man2/quotactl.2
 
-# Part of modutils
-rm -fv man2/get_kernel_syms.2
-rm -fv man2/{create,query}_module.2
+## Part of modutils - now the man pages should be here
+#rm -fv man2/get_kernel_syms.2
+#rm -fv man2/{create,query}_module.2
 
 # Part of console-tools
 rm -fv man4/console.4
@@ -166,6 +172,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/en/man*
 
 %changelog
+* Fri Jul 14 2006 Ivana Varekova <varekova@redhat.com> 2.36-1
+- add nscd_conf options (nscd_conf.patch)
+- added {create,query}_module.2, get_kernel_syms.2 man-pages 
+- added nscd, getrlimit, libaio and write patch
+- remove sigprocmask patch
+- update to 2.36
+
 * Thu Jul 13 2006 Marcela Maslanova <mmaslano@redhat.com> 2.34-3
 - fix small typo (#198663)
 
diff --git a/sources b/sources
index 55ef0a4..0853b46 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 57f2e0500d177e05647990eae439a8ee  man-pages-extralocale.tar.bz2
 af09d031dcee66929510e078d00066f2  man2.tar.gz
-fb8d9f55fef19ea5ab899437159c9420  man-pages-2.34.tar.bz2
+c661eb3ff67a3bfe45fe966d74dd22df  man-pages-2.36.tar.bz2