diff --git a/ChangeLog b/ChangeLog
index 4253f43..f360ba1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-07-18  Mikaël Urankar  <mikael.urankar@gmail.com>
+
+	* config.guess (arm*:FreeBSD:*:*): New.
+	* testsuite/config-guess.data: Add a test case.
+
 2018-07-15  Ben Elliston  <bje@gnu.org>
 
 	* testsuite/config-guess.data: Sort.
diff --git a/config.guess b/config.guess
index ced991e..2c6634f 100755
--- a/config.guess
+++ b/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-07-13'
+timestamp='2018-07-18'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -843,6 +843,17 @@ EOF
     *:BSD/OS:*:*)
 	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
 	exit ;;
+    arm*:FreeBSD:*:*)
+	UNAME_PROCESSOR=`uname -p`
+	set_cc_for_build
+	if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_PCS_VFP
+	then
+	    echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi
+	else
+	    echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf
+	fi
+	exit ;;
     *:FreeBSD:*:*)
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	case "$UNAME_PROCESSOR" in
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index 325c604..81a0e04 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -13,6 +13,8 @@ arceb | ignored | Linux | ignored | ignored | arceb-unknown-linux-gnu
 arc | ignored | Linux | ignored | ignored | arc-unknown-linux-gnu
 arm | ignored | riscos | ignored | ignored | arm-unknown-riscos
 arm | ignored | RISCOS | ignored | ignored | arm-unknown-riscos
+arm | 12.0 | FreeBSD | ignored | armv6 | armv6-unknown-freebsd12.0-gnueabi
+arm | 12.0 | FreeBSD | ignored | armv7 | armv7-unknown-freebsd12.0-gnueabi
 armv4l | ignored | riscos | ignored | ignored | arm-unknown-riscos
 authenticamd | 6.0 | Interix | ignored | ignored | x86_64-unknown-interix6.0
 avr32 | 2.6.15 | Linux | ignored | ignored | avr32-unknown-linux-gnu