diff --git a/ChangeLog b/ChangeLog
index 175d09fd7f466a5024833932cb98a905cb9525cf..4c8e2553ade43cc4a065503824d550056131239f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Thu Nov  2 20:40:58 1995  Per Cederqvist  (ceder@lysator.liu.se)
+
+	* Optionally use GNU Malloc.
+	* configure.in: Handle --with-gnu-malloc.
+	* scripts/makedist.sh: Include gnumalloc.  
+	Avoid distributing files named *.tmp.
+	* mkmi: Generate src/libraries/gnumalloc/Makefile.
+	* src/libraries/Makefile.src (SUBDIRS): Include @GNUMALLOC@.
+
+	* scripts/mkmi.m4 (ALL_CFLAGS): Don't include
+	"-I@BUILDTOPDIR@/include/server".
+
 Mon Oct 23 07:56:26 1995  Per Cederqvist  (ceder@lysator.liu.se)
 
 	* versions (PROTOCOL-A-LEVEL): Level 8.
diff --git a/src/server/ChangeLog b/src/server/ChangeLog
index c4d5c33010729bb8f3ce82b972628b47c69a9848..3b279a25ccf36de1f41c1e6ae5f74ec8ea779dfb 100644
--- a/src/server/ChangeLog
+++ b/src/server/ChangeLog
@@ -1,3 +1,18 @@
+Thu Nov  2 20:58:40 1995  Per Cederqvist  (ceder@lysator.liu.se)
+
+	* cache-database.c: Include "server/smalloc.h", not "smalloc.h".
+	* server-config.c: Likewise.
+	* conf-file.c: Likewise.
+	* cache.c: Likewise.
+
+	* Optionally use GNU Malloc.
+	* Makefile.src (MALLOCLIB): New variable.  Use it everywhere a
+	program is linked.
+	(.gdbinit): Added libraries/gnumalloc.  Changed libraries/libisc
+	to libraries/libisc-new.
+	* ram-smalloc.c: Include "malloc.h" instead of <stdlib.h> if
+	USE_GNU_MALLOC is defined.
+
 Tue Oct 31 12:14:15 1995  David Byers  <byers@lysator.liu.se>
 
 	* prot-a-output.c: Added UConference and extended conf-type