diff --git a/ChangeLog b/ChangeLog
index 364b0ab9..afce07d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-02-19  Ben Elliston <bje@cygnus.com>
+	
+	* config.guess: Automatically recognise ELF on FreeBSD. From Niall
+	Smart and improved by Andrew Cagney.
+
 1999-02-19  Felix Lee  <flee@cygnus.com>
 
 	* acgeneral.m4 (AC_CACHE_VAL): Don't need backticks. This is a
diff --git a/config.guess b/config.guess
index 78297ba9..b5a39ae0 100755
--- a/config.guess
+++ b/config.guess
@@ -525,6 +525,12 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
     *:FreeBSD:*:*)
+	if test -x /usr/bin/objformat; then
+	    if test "elf" = "`/usr/bin/objformat`"; then
+		echo ${UNAME_MACHINE}-unknown-freebsdelf`echo${UNAME_RELEASE}|sed -e 's/[-_].*//'`
+		exit 0
+	    fi
+	fi
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
     *:NetBSD:*:*)