diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 222d327153..d92cf0a6a0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,15 @@
+1999-01-19  Jim Blandy  <jimb@zwingli.cygnus.com>
+
+	Use aclocal to generate GDB's aclocal.m4 script.  
+	* acinclude.m4: New file, containing the hand-written local macro
+ 	definitions that used to be in aclocal.m4.  Don't sinclude
+ 	../bfd/aclocal.m4 any more; running aclocal in this directory will
+ 	get us the definitions we need.  HOWEVER: Do sinclude
+ 	../bfd/acinclude.m4, because we need the definition of
+ 	BFD_NEED_DECLARATION.
+	* aclocal.m4: Regenerated by aclocal.
+	* configure: Regenerated by autoconf.
+
 Tue Jan 19 10:27:23 1999  David Taylor  <taylor@texas.cygnus.com>
 
 	* breakpoint.c (disable_breakpoints_in_shlibs): new parameter,
@@ -128,6 +140,7 @@ Mon Jan 18 08:47:02 1999  Andrew Cagney  <cagney@b1.cygnus.com>
 	* remote.c (remote_query): new function - creates proper interface
 	to the remote protocol "q" command.	
 
+>>>>>>> 1.4744
 Fri Jan 15 17:11:48 EST 1999  Zdenek Radouch   (radouch@cygnus.com)
 
 	* config/fr30/tm-fr30.h:  Changed ABI to match GCC change