diff --git a/ChangeLog b/ChangeLog
index ae3692d784fe734ef9df0945a5ebe11a2d4a7244..9833ddd7751f38a34be1bfadeda9e1e75ef5d3ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-16  Yavor Doganov  <yavor@gnu.org>  (tiny change)
+
+	* configure.in: Replace the obsolete macros AC_AIX and
+	AC_GNU_SOURCE with AC_USE_SYSTEM_EXTENSIONS.
+
 2008-04-05  Andreas Schwab  <schwab@suse.de>
 
 	* configure.in: No longer create admin/unidata/Makefile.
diff --git a/configure.in b/configure.in
index 8e46bf995af6ff2a69b84757861e7a45d5fed005..c6a0f059c00e2ecafce7fc4e30c283032e9e4371 100644
--- a/configure.in
+++ b/configure.in
@@ -852,8 +852,7 @@ then
 fi
 
 dnl checks for Unix variants
-AC_AIX
-AC_GNU_SOURCE
+AC_USE_SYSTEM_EXTENSIONS
 
 ### Use -Wno-pointer-sign if the compiler supports it
 AC_MSG_CHECKING([whether gcc understands -Wno-pointer-sign])
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 545ddb1ae5e111c5deb8c039881bad857a1968ea..57185db2f7d9933e4806b968023551d7fdbeb99b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,4 @@
-2008-04-16  Yoni Rabkin  <yoni@rabkins.net>  (tiny change)
+2008-04-16  Yoni Rabkin  <yoni@rabkins.net>
 
 	* textmodes/artist.el:
 	* progmodes/vhdl-mode.el: