diff --git a/ChangeLog b/ChangeLog
index 9dec4b8291b9e6d176ba4b57aafa5cc895b24855..345b4dd0dc26f2ec423177d624845733f638189f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-11  John (J5) Palmieri  <johnp@redhat.com>
+
+	* configure.in: Check for gethostbyname first before we check for it
+	in libnsl.  On gnu systems it is implemeneted 
+
 2006-10-13  Havoc Pennington  <hp@redhat.com>
 
 	* dbus/dbus-connection.c
diff --git a/configure.in b/configure.in
index 2af29b3c2b99204e759f4d0b7ad8429022f0fe55..1c6ece0c95a6ae3b6dd44a310fdc3cefa103a65d 100644
--- a/configure.in
+++ b/configure.in
@@ -508,7 +508,7 @@ fi
 
 #### Various functions
 AC_CHECK_LIB(socket,socket)
-AC_CHECK_LIB(nsl,gethostbyname)
+AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])
 
 AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep poll setenv unsetenv socketpair getgrouplist fpathconf)