diff --git a/Changes b/Changes
index 2b38d977c..803204638 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,6 @@
 ==================== Changes in man-pages-2.04 ====================
 
-Released: ????-??-??
+Released: 2005-06-21
 
 Contributors
 ------------
@@ -9,23 +9,172 @@ The following people contributed notes, ideas, or patches that have
 been incorporated in changes in this release:
 
 Andries Brouwer <Andries.Brouwer@cwi.nl>
+Baurjan Ismagulov <ibr@ata.cs.hun.edu.tr>
+Dave Love <d.love@dl.ac.uk>
+Dieter Brueggemann <dieter.brueggemann@entitec.de>
+Geoff Clare <gclare@gclare.org.uk>
+Guido Trotter <ultrotter@debian.org>
 ####Joey (Martin) Schulze <joey@infodrom.org>
+kabloom kabloom@ucdavis.edu
+Kevin Ryde <user42@zip.com.au>
+Justin Pryzby <justinpryzby@users.sourceforge.net>
+Mike Furr <mfurr@debian.org>
+Olivier Croquette <ocroquette@free.fr>
+Olivier Guilyardi <ylf@xung.org>
+Peter Cordes <peter@llama.nslug.ns.ca>
+Philipp Spitzer <philipp@toastfreeware.priv.at>
+Tanaka Akira <akr@m17n.org>
+Thierry Excoffier <exco@bat710.univ-lyon1.fr>
+Thomas Hood <jdthood@yahoo.co.uk>
+Vincent Lefevre <vincent@vinc17.org>
+Walter Harms <walter.harms@informatik.uni-oldenburg.de>
 
 Apologies if I missed anyone!
 
 Global changes
 --------------
 
+For consistency across pages:
+
+    1,$s/nonzero/non-zero/g
+
 Typographical or grammatical errors have been corrected in several
 places.
 
 
-New Pages
+New pages
 ---------
 
 pthreads.7
     mtk
         An overview of the Linux implementations of POSIX threads.
 
+
 Changes to individual pages
-----------------
+---------------------------
+
+_exit.2
+    mtk
+        Various minor changes
+
+epoll_ctl.2
+    Mike Furr <mfurr@debian.org>
+        BUGS: In kernels < 2.6.9, EPOLL_CTL_DEL required a non-NULL
+        'event', even though this argument is ignored.
+        As per http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=306517.
+
+flock.2
+   mtk / Kevin Ryde
+       Clarified semantics of relationship between flock() locks
+       and open file entries and file descriptors.
+       See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=291121
+       
+getitimer.2
+    Olivier Croquette, Thierry Excoffier
+        Noted the existence of the short sleep bug (up to 1 jiffy).
+
+getrlimit.2
+    mtk
+        RLIMIT_RSS only has affect "in 2.4.x", not "in 2.4 and later".
+
+getrusage.2
+    Geoff Clare
+        Since Linux 2.6, the ru_nvcsw and ru_nivcsw fields are used.
+
+nice.2
+    mtk / Guido Trotter
+        Rewrote description of return value.
+        As per http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=296183
+
+open.2
+    Walter Harms
+        O_DIRECT needs _GNU_SOURCE.
+    mtk
+        O_ASYNC works for pipes and FIFOs in Linux 2.6
+        Various minor fixes
+
+atexit.3
+    mtk
+        Various minor changes
+
+exit.3
+    mtk
+        Various minor changes
+
+getopt.3
+   mtk / Philipp Spitzer
+       Fix description of return value.
+       See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=308359
+       
+hsearch.3
+    mtk
+        Changed (char *) to (void *) in example.
+        See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=313607
+
+log1p.3
+    Justin Pryzby
+        make log(3) SEE ALSO log1p(3)
+        As per http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=309578
+
+makecontext.3
+    Tanaka Akira
+        Fix description of RETURN VAUE for makecontext()
+        As per http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=311800
+
+on_exit.3
+    mtk
+        Various minor changes
+
+rand.3
+    kabloom@ucdavis.edu
+        Small fix to a code example
+        As per http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=194842.
+
+realpath.3
+    mtk / Thomas Hood
+        When specifying resolved_path as NULL, realpath()
+        will (still) only allocate up to PATH_MAX bytes.
+	Plus other minor changes.
+	See also http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=239424
+
+rcmd.3
+    Dave Love
+        The required header file for these funtions on Linux is <netdb.h>
+        As per http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=311680
+
+scanf.3
+    Olivier Guilyardi
+        Arg for %p is a pointer to _a pointer to_ void.
+        As per http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=263109
+
+stdin.3
+    Vincent Lefevre
+        freopen() can change the descriptors associated with
+        stdin/stdout/stderr.
+        As per http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=295859.
+
+strerror.3
+    Baurjan Ismagulov
+        strerror_r(3) requires #define _XOPEN_SOURCE 600
+        As per http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=290880
+
+sysconf.3
+     Peter Cordes / mtk
+         Fix typo: "_SC_2_DEV" should be "_SC_2_C_DEV"
+
+proc.5
+    mtk
+        Added pointers under /proc/sys/net to tcp.7 and ip.7
+
+ip.7
+    mtk
+        Various wording and formatting fixes.
+        Reordered /proc/sys/net/ipv4/ip_* file descriptions alphabetically.
+
+tcp.7
+    Dieter Brueggemann / mtk
+        Fixes to the discussion of SIOCATMARK and tcp_stdurg
+    mtk
+        Various wording and formatting fixes.
+        Incorporated some new /proc/sys/net/ipv4/tcp_* file descriptions
+        from the 2.6.12 source file Documentation/networking/ip-sysctl.txt.
diff --git a/man-pages-2.04.lsm b/man-pages-2.04.lsm
index 671eb44f2..a01e6def0 100644
--- a/man-pages-2.04.lsm
+++ b/man-pages-2.04.lsm
@@ -1,7 +1,7 @@
 Begin3
 Title:          Section 2, 3, 4, 5 and 7 man pages for Linux
 Version:        2.04
-Entered-date:   ????-??-??
+Entered-date:   2005-06-21
 Description:    Linux and POSIX manual pages
 Keywords:       man pages
 Author:         several