--- a/lib-src/ChangeLog	Sat Feb 20 06:03:00 2010 -0600
+++ b/lib-src/ChangeLog	Sun May 01 18:44:03 2011 +0100
@@ -1,3 +1,69 @@
+2011-04-29  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.5.31 "ginger" is released.
+
+2011-04-26  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.5.30 "garlic" is released.
+
+2011-01-15  Mike Sperber  <mike@xemacs.org>
+
+	* fakemail.c: #include <osreldate.h> on FreeBSD, since we no
+	longer have freebsd.h.
+
+2010-06-14  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* gnuserv.c:
+	* gnuserv.h:
+	* gnuslib.c:
+	Add standard permission boilerplate.
+
+	* ad2c:
+	Add copyright notices based on internal evidence.
+
+2010-06-14  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* cvtmail.c:
+	* fakemail.c:
+	* make-path.c:
+	* profile.c:
+	* tcp.c:
+	Fix typo (doubled phrase) in permission notice.
+
+2010-06-13  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* ad2c: Correct FSF address in permission notice.
+
+2010-06-02  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* gnuclient.c (main):
+	If gnuclient was built with GTK support, and is asking a gnuserv
+	without GTK support to open a frame, fall back to X11, don't
+	throw an error on the server side, invisible to the client.
+
+2010-04-17  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* make-docfile.c (scan_lisp_file):
+	Even if a function doesn't have a doc string, store its file name
+	in DOC.
+
+2010-03-02  Ben Wing  <ben@xemacs.org>
+
+	* digest-doc.c:
+	* make-path.c:
+	`emacs' isn't defined, but HAVE_CONFIG_H is, so use it to get
+	config.h.
+	
+	* getopt.h:
+	Conditionalize on HAVE_CONFIG_H to get real prototypes.
+
+2010-02-25  Ben Wing  <ben@xemacs.org>
+
+	* make-docfile.c:
+	* make-docfile.c (write_c_args):
+	Convert newlines to spaces so that argument lists are always on one
+	line, because that's what function-documentation-1 expects.
+
 2010-02-19  Ben Wing  <ben@xemacs.org>
 
 	* digest-doc.c:
@@ -2158,3 +2224,22 @@
 
 	* update-elc.sh: Corrections to protect against too smart /bin/sh'es.
 
+
+ChangeLog entries synched from GNU Emacs are the property of the FSF.
+Other ChangeLog entries are usually the property of the author of the
+change.
+
+This file is part of XEmacs.
+
+XEmacs is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs.  If not, see <http://www.gnu.org/licenses/>.