diff --git a/ChangeLog b/ChangeLog
index b7ed4f2..2dd0917 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-22  Ben Elliston  <bje@redhat.com>
+
+	* config.guess: Do not differentiate FreeBSD systems that use the
+	ELF object file format. From David O'Brien <obrien@freebsd.org>.
+
 2000-04-22  Ben Elliston  <bje@redhat.com>
 
 	* config.guess: Detect Siemens BS2000 machines. From Jean-Frederic
diff --git a/config.guess b/config.guess
index 2a00dc6..2025f12 100755
--- a/config.guess
+++ b/config.guess
@@ -616,12 +616,6 @@ 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 ;;
     *:OpenBSD:*:*)