diff --git a/.cvsignore b/.cvsignore
index efae33d..afd2208 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
 man-pages-extralocale.tar.bz2
 man2.tar.gz
 man2_sys2.1.tar.gz
-man-pages-2.46.tar.bz2
+man-pages-2.48.tar.bz2
diff --git a/man-pages-1.60-fs.patch b/man-pages-1.60-fs.patch
deleted file mode 100644
index 43eff94..0000000
--- a/man-pages-1.60-fs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- man-pages-1.67/man5/fs.5.fs	2001-12-09 00:05:03.000000000 +0100
-+++ man-pages-1.67/man5/fs.5	2005-03-07 11:15:58.000000000 +0100
-@@ -71,7 +71,10 @@
- .TP
- .B ext3
- is a journaling version of the ext2 filesystem. It is easy to
--switch back and forth between ext2 and ext3.
-+switch back and forth between ext2 and ext3. ext3 offers the most
-+complete set of journaling options available among journaling
-+filesystems.
-+.\"----------------------------------------------------------------------
- .TP
- .B xiafs
- was designed and implemented to be a stable, safe filesystem by
diff --git a/man-pages-2.25-malloc.patch b/man-pages-2.25-malloc.patch
deleted file mode 100644
index e39cdca..0000000
--- a/man-pages-2.25-malloc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- man-pages-2.25/man3/malloc.3.pom	2006-03-16 10:56:03.000000000 +0100
-+++ man-pages-2.25/man3/malloc.3	2006-03-16 11:21:15.428524576 +0100
-@@ -159,13 +159,17 @@
- with the same argument, or overruns of a single byte (off-by-one
- bugs).  Not all such errors can be protected against, however, and
- memory leaks can result.
--If
--.BR MALLOC_CHECK_
--is set to 0, any detected heap corruption is silently ignored;
--if set to 1, a diagnostic is printed on stderr;
--if set to 2,
--.BR abort ()
--is called immediately.  This can be useful because otherwise
-+If 
-+.BR MALLOC_CHECK_ 
-+is set to 0, any detected heap corruption is silently ignored and 
-+an error message is not generated; 
-+if set to 1, the error message is printed on stderr, but the program 
-+is not aborted; 
-+if set to 2, 
-+.BR abort() 
-+is called immediately, but the error message is not generated; 
-+if set to 3, the error message is printed on stderr and program is aborted.
-+This can be useful because otherwise
- a crash may happen much later, and the true cause for the problem
- is then very hard to track down.
- .SH BUGS
diff --git a/man-pages-2.39-tgkill.patch b/man-pages-2.39-tgkill.patch
deleted file mode 100644
index d81c27e..0000000
--- a/man-pages-2.39-tgkill.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- man-pages-2.39/man2/tkill.2.pom	2006-08-03 15:57:17.000000000 +0200
-+++ man-pages-2.39/man2/tkill.2	2006-12-08 11:36:52.000000000 +0100
-@@ -25,7 +25,7 @@
- .\"
- .TH TKILL 2 "2004-05-31" "Linux 2.6.6" "Linux Programmer's Manual"
- .SH NAME
--tkill, tgkill \- send a signal to a single process
-+tkill \- send a signal to a single process
- .SH SYNOPSIS
- .nf
- .B #include <sys/types.h>
-@@ -39,10 +39,6 @@
- .sp
- .B int tkill(int tid, int sig);
- .sp
--.B "_syscall3(int, tgkill, int, tgid, int, tid, int, sig)"
--          /* Using \fBsyscall\fP(2) may be preferable; see \fBintro\fP(2) */
--.sp
--.B int tgkill(int tgid, int tid, int sig);
- .fi
- .SH DESCRIPTION
- The \fBtkill\fP() system call is analogous to
-@@ -54,11 +50,6 @@
- With \fBtkill\fP(), however, one can address each process
- by its unique TID.
- .PP
--The \fBtgkill\fP() call improves on \fBtkill\fP() by allowing the caller to
--specify the thread group ID of the thread to be signalled, protecting
--against TID reuse. If the tgid is specified as \-1, \fBtgkill\fP() degenerates
--into \fBtkill\fP().
--.PP
- These are the raw system call interfaces, meant for internal
- thread library use.
- .SH "RETURN VALUE"
-@@ -76,11 +67,11 @@
- .B ESRCH
- No process with the specified thread ID (and thread group ID) exists.
- .SH "CONFORMING TO"
--\fBtkill\fP() and \fBtgkill\fP() are Linux specific and should not be used
-+\fBtkill\fP() is Linux specific and should not be used
- in programs that are intended to be portable.
- .SH VERSIONS
- \fBtkill\fP() is supported since Linux 2.4.19 / 2.5.4.
--\fBtgkill\fP() was added in Linux 2.5.75.
- .SH "SEE ALSO"
- .BR gettid (2),
--.BR kill (2)
-+.BR kill (2),
-+.BR tgkill (2)
diff --git a/man-pages-2.41-mmap.patch b/man-pages-2.41-mmap.patch
deleted file mode 100644
index 0f04168..0000000
--- a/man-pages-2.41-mmap.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- man-pages-2.41/man2/mmap.2.pom	2006-10-20 10:43:21.000000000 +0200
-+++ man-pages-2.41/man2/mmap.2	2006-10-20 13:03:25.000000000 +0200
-@@ -249,9 +249,15 @@
- when the process is terminated.  On the other hand, closing the file
- descriptor does not unmap the region.
- .LP
--The address
-+If
-+.B MAP_FIXED
-+is specified,
- .I start
--must be a multiple of the page size. All pages containing a part
-+must be a multiple of the page size.
-+In all other cases 
-+.I start
-+address is rounded up to the next page size boundary.
-+All pages containing a part
- of the indicated range are unmapped, and subsequent references
- to these pages will generate SIGSEGV. It is not an error if the
- indicated range does not contain any mapped pages.
diff --git a/man-pages-2.43-passwd.patch b/man-pages-2.43-passwd.patch
deleted file mode 100644
index 463813e..0000000
--- a/man-pages-2.43-passwd.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- man-pages-2.43/man5/passwd.5.pom	2006-07-05 14:45:41.000000000 +0200
-+++ man-pages-2.43/man5/passwd.5	2007-02-27 12:23:27.000000000 +0100
-@@ -45,11 +45,20 @@
- basic assumption used to be that of a friendly user-community.  These days
- many people run some version of the shadow password suite, where
- .I /etc/passwd
--has asterisks (*) instead of encrypted passwords, 
-+has "x" instead of encrypted passwords, 
- and the encrypted passwords are in
- .I /etc/shadow
- which is readable by the superuser only.
- .PP
-+If the encrypted password, whether in /etc/passwd or in /etc/shadow, is
-+an empty string, login is allowed without even asking for a password.
-+Note that this functionality may be intentionally disabled in applications,
-+or configurable (for example using the "nullok" or "nonull" arguments to
-+pam_unix.so).
-+.PP
-+If the encrypted password in /etc/passwd is "*NP*" (without the quotes),
-+the shadow record should be obtained from a NIS+ server.
-+.PP
- Regardless of whether shadow passwords are used, many sysadmins
- use an asterisk in the encrypted password field to make sure
- that this user can not authenticate him- or herself using a
diff --git a/man-pages-2.48-fs.patch b/man-pages-2.48-fs.patch
new file mode 100644
index 0000000..0408d80
--- /dev/null
+++ b/man-pages-2.48-fs.patch
@@ -0,0 +1,14 @@
+--- man-pages-2.48/man5/fs.5.pom	2007-04-13 00:42:49.000000000 +0200
++++ man-pages-2.48/man5/fs.5	2007-05-11 10:08:43.000000000 +0200
+@@ -73,7 +73,10 @@
+ .B ext3
+ is a journaling version of the ext2 filesystem.
+ It is easy to
+-switch back and forth between ext2 and ext3.
++switch back and forth between ext2 and ext3. ext3 offers the most
++complete set of journaling options available among journaling
++filesystems.
++.\"---------------------------------------------------------------------- 
+ .TP
+ .B xiafs
+ was designed and implemented to be a stable, safe filesystem by
diff --git a/man-pages-2.48-malloc.patch b/man-pages-2.48-malloc.patch
new file mode 100644
index 0000000..478e173
--- /dev/null
+++ b/man-pages-2.48-malloc.patch
@@ -0,0 +1,21 @@
+--- man-pages-2.48/man3/malloc.3.pom	2007-04-13 00:42:49.000000000 +0200
++++ man-pages-2.48/man3/malloc.3	2007-05-11 10:11:30.000000000 +0200
+@@ -166,11 +166,14 @@
+ memory leaks can result.
+ If
+ .BR MALLOC_CHECK_
+-is set to 0, any detected heap corruption is silently ignored;
+-if set to 1, a diagnostic is printed on stderr;
++is set to 0, any detected heap corruption is silently ignored and
++an error message is not generated;
++if set to 1, the error message is printed on stderr, but the program
++is not aborted;
+ if set to 2,
+-.BR abort ()
+-is called immediately.
++.BR abort()
++is called immediately, but the error message is not generated;
++if set to 3, the error message is printed on stderr and program is aborted.
+ This can be useful because otherwise
+ a crash may happen much later, and the true cause for the problem
+ is then very hard to track down.
diff --git a/man-pages-2.48-mmap.patch b/man-pages-2.48-mmap.patch
new file mode 100644
index 0000000..b4f02cd
--- /dev/null
+++ b/man-pages-2.48-mmap.patch
@@ -0,0 +1,18 @@
+--- man-pages-2.48/man2/mmap.2.pom	2007-04-13 00:42:49.000000000 +0200
++++ man-pages-2.48/man2/mmap.2	2007-05-11 10:16:29.000000000 +0200
+@@ -279,9 +279,14 @@
+ On the other hand, closing the file
+ descriptor does not unmap the region.
+ .LP
+-The address
++If
++.B MAP_FIXED
++is specified,
+ .I start
+ must be a multiple of the page size.
++In all other cases
++.I start
++address is rounded up to the next page size boundary.
+ All pages containing a part
+ of the indicated range are unmapped, and subsequent references
+ to these pages will generate SIGSEGV.
diff --git a/man-pages-2.48-passwd.patch b/man-pages-2.48-passwd.patch
new file mode 100644
index 0000000..2c824b2
--- /dev/null
+++ b/man-pages-2.48-passwd.patch
@@ -0,0 +1,24 @@
+--- man-pages-2.48/man5/passwd.5.pom	2007-04-13 00:42:49.000000000 +0200
++++ man-pages-2.48/man5/passwd.5	2007-05-11 10:33:22.000000000 +0200
+@@ -46,11 +46,20 @@
+ basic assumption used to be that of a friendly user-community.
+ These days many people run some version of the shadow password suite, where
+ .I /etc/passwd
+-has asterisks (*) instead of encrypted passwords,
++has "x" instead of encrypted passwords,
+ and the encrypted passwords are in
+ .I /etc/shadow
+ which is readable by the superuser only.
+ .PP
++If the encrypted password, whether in /etc/passwd or in /etc/shadow, is 
++an empty string, login is allowed without even asking for a password. 
++Note that this functionality may be intentionally disabled in applications, 
++or configurable (for example using the "nullok" or "nonull" arguments to 
++pam_unix.so). 
++.PP 
++If the encrypted password in /etc/passwd is "*NP*" (without the quotes), 
++the shadow record should be obtained from a NIS+ server. 
++.PP
+ Regardless of whether shadow passwords are used, many sysadmins
+ use an asterisk in the encrypted password field to make sure
+ that this user can not authenticate him- or herself using a
diff --git a/man-pages-2.48-tgkill.patch b/man-pages-2.48-tgkill.patch
new file mode 100644
index 0000000..e0ad0e2
--- /dev/null
+++ b/man-pages-2.48-tgkill.patch
@@ -0,0 +1,49 @@
+--- man-pages-2.48/man2/tkill.2.pom	2007-04-13 00:42:49.000000000 +0200
++++ man-pages-2.48/man2/tkill.2	2007-05-11 10:25:00.000000000 +0200
+@@ -25,7 +25,7 @@
+ .\"
+ .TH TKILL 2 "2004-05-31" "Linux 2.6.6" "Linux Programmer's Manual"
+ .SH NAME
+-tkill, tgkill \- send a signal to a single process
++tkill \- send a signal to a single process
+ .SH SYNOPSIS
+ .nf
+ .B #include <sys/types.h>
+@@ -39,10 +39,6 @@
+ .sp
+ .B int tkill(int tid, int sig);
+ .sp
+-.B "_syscall3(int, tgkill, int, tgid, int, tid, int, sig)"
+-          /* Using \fBsyscall\fP(2) may be preferable; see \fBintro\fP(2) */
+-.sp
+-.B int tgkill(int tgid, int tid, int sig);
+ .fi
+ .SH DESCRIPTION
+ The \fBtkill\fP() system call is analogous to
+@@ -54,12 +50,6 @@
+ With \fBtkill\fP(), however, one can address each process
+ by its unique TID.
+ .PP
+-The \fBtgkill\fP() call improves on \fBtkill\fP() by allowing the caller to
+-specify the thread group ID of the thread to be signalled, protecting
+-against TID reuse.
+-If the tgid is specified as \-1, \fBtgkill\fP() degenerates
+-into \fBtkill\fP().
+-.PP
+ These are the raw system call interfaces, meant for internal
+ thread library use.
+ .SH "RETURN VALUE"
+@@ -79,11 +69,11 @@
+ .B ESRCH
+ No process with the specified thread ID (and thread group ID) exists.
+ .SH "CONFORMING TO"
+-\fBtkill\fP() and \fBtgkill\fP() are Linux specific and should not be used
++\fBtkill\fP() is Linux specific and should not be used
+ in programs that are intended to be portable.
+ .SH VERSIONS
+ \fBtkill\fP() is supported since Linux 2.4.19 / 2.5.4.
+-\fBtgkill\fP() was added in Linux 2.5.75.
+ .SH "SEE ALSO"
+ .BR gettid (2),
+ .BR kill (2)
++.BR tgkill (2) 
diff --git a/man-pages.spec b/man-pages.spec
index 0dbe924..816bb2a 100644
--- a/man-pages.spec
+++ b/man-pages.spec
@@ -1,6 +1,6 @@
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
-Version: 2.46
+Version: 2.48
 Release: 1%{?dist}
 License: distributable
 Group: Documentation
@@ -16,20 +16,20 @@ Source12: gai.conf.5
 Source13: nss.5
 Source14: man2_sys2.1.tar.gz
 Patch1: man-pages-1.51-iconv.patch
-Patch8: man-pages-1.60-fs.patch
-Patch24: man-pages-2.25-malloc.patch
+Patch8: man-pages-2.48-fs.patch
+Patch24: man-pages-2.48-malloc.patch
 Patch28: man-pages-2.46-nscd.patch
 Patch30: man-pages-2.46-libaio-includes.patch
 Patch36: man-pages-2.39-unimplemented.patch
-Patch37: man-pages-2.41-mmap.patch
+Patch37: man-pages-2.48-mmap.patch
 Patch38: man-pages-2.43-mount.patch
-Patch39: man-pages-2.39-tgkill.patch
+Patch39: man-pages-2.48-tgkill.patch
 Patch40: man-pages-2.39-mmap2.patch
 Patch41: man-pages-2.43-rt_spm.patch
 Patch42: man-pages-2.43-swapon.patch
 Patch43: man-pages-2.43-rand.patch
 Patch44: man-pages-2.43-fadvise.patch
-Patch45: man-pages-2.43-passwd.patch
+Patch45: man-pages-2.48-passwd.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Autoreq: false
@@ -212,6 +212,9 @@ rm -rf $RPM_BUILD_ROOT
 %lang(en) %{_mandir}/en/man*
 
 %changelog
+* Fri May 11 2007 Ivana Varekova <varekova@redhat.com> 2.48-1
+- update to 2.48
+
 * Mon Apr 30 2007 Ivana Varekova <varekova@redhat.com> 2.46-1
 - update to 2.46
 
diff --git a/sources b/sources
index 719ac63..dd682f7 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 57f2e0500d177e05647990eae439a8ee  man-pages-extralocale.tar.bz2
 af09d031dcee66929510e078d00066f2  man2.tar.gz
 fbc03fdbc665e24961d30dad3ed8596d  man2_sys2.1.tar.gz
-318a948119a593b5042b7eb52a2ab79e  man-pages-2.46.tar.bz2
+d357e5a462bec71feb91d72d0b0c4fda  man-pages-2.48.tar.bz2