diff --git a/ChangeLog b/ChangeLog
index 696bebd..58fe07f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-11 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+	* configure.ac: Move AC_CANONICAL_* stuff before AM_INIT_AUTOMAKE to
+	  eliminate warning message about AC_ARG_PROGRAM being called
+	  before AC_CANONICAL_TARGET.
+
 2005-04-11 Paul Jakma <paul.jakma@sun.com>
 
 	* configure.ac: Call AC_CANONICAL_{BUILD,TARGET} macros. Target isnt
diff --git a/configure.ac b/configure.ac
index 8e0324d..645f7ea 100755
--- a/configure.ac
+++ b/configure.ac
@@ -5,11 +5,19 @@
 ##  Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org>
 ##  Portions Copyright (c) 2003 Paul Jakma <paul@dishone.st>
 ##
-## $Id: configure.ac,v 1.101 2005/04/11 07:10:47 paul Exp $
+## $Id: configure.ac,v 1.102 2005/04/11 14:55:55 ajs Exp $
 AC_PREREQ(2.53)
 
 AC_INIT(Quagga, 0.99.0, [http://bugzilla.quagga.net])
 AC_CONFIG_SRCDIR(lib/zebra.h)
+
+dnl -----------------------------------
+dnl Get hostname and other information.
+dnl -----------------------------------
+AC_CANONICAL_BUILD()
+AC_CANONICAL_HOST()
+AC_CANONICAL_TARGET()
+
 AM_INIT_AUTOMAKE(1.6)
 AM_CONFIG_HEADER(config.h)
 
@@ -33,13 +41,6 @@
 AC_SUBST(pkgsrcdir)
 AC_SUBST(pkgsrcrcdir)
 
-dnl -----------------------------------
-dnl Get hostname and other information.
-dnl -----------------------------------
-AC_CANONICAL_BUILD()
-AC_CANONICAL_HOST()
-AC_CANONICAL_TARGET()
-
 dnl ------------
 dnl Check CFLAGS
 dnl ------------