diff --git a/CHANGES b/CHANGES
index 0f457c0c31a3797fcbd08e6844f18f5354c92fae..f69e6ed152c708f13de88cd2225b513857281aeb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@
 
  Changes between 0.9.01c and 0.9.1d
 
+  *) Autodetect FreeBSD3.
+     [Ben Laurie]
+
   *) Fix various bugs in Configure. This affects the following platforms:
      nextstep
      ncr-scde
diff --git a/config b/config
index f403a22451f8ac716e52238041048d3648fd45cf..0416a5ad88beb31baf0b289a62f535149f14c866 100755
--- a/config
+++ b/config
@@ -125,6 +125,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
 	echo "${MACHINE}-whatever-bsdi"; exit 0
 	;;
 
+    FreeBSD:3*:*:*)
+	echo "${MACHINE}-whatever-freebsd3"; exit 0
+	;;
+
     FreeBSD:*:*:*486*)
 	echo "i486-whatever-freebsd"; exit 0
 	;;
@@ -304,6 +308,7 @@ case "$GUESSOS" in
   sun4*-sun-solaris2) OUT="solaris-sparc-$CC" ;;
   *86*-sun-solaris2) OUT="solaris-x86-$CC" ;;
   *-*-sunos4) OUT="sunos-$CC" ;;
+  *-freebsd3) OUT="FreeBSD-elf" ;;
   *-freebsd) OUT="FreeBSD" ;;
   *86*-*-netbsd) OUT="NetBSD-x86" ;;
   sun3*-*-netbsd) OUT="NetBSD-m68" ;;