--- acinclude.m4.orig	2008-11-08 19:49:57.000000000 +0300
+++ acinclude.m4	2008-12-08 20:32:49.000000000 +0300
@@ -320,10 +320,14 @@
 		MKAFS_OSTYPE=DARWIN
                 AC_MSG_RESULT(x86_darwin)
                 ;;
-	*-freebsd*)
+	i386-*-freebsd*)
 		MKAFS_OSTYPE=FBSD
 		AC_MSG_RESULT(i386_fbsd)
 		;;
+	x86_64-*-freebsd*)
+		MKAFS_OSTYPE=FBSD
+		AC_MSG_RESULT(amd64_fbsd)
+		;;
 	*-netbsd*)
 		MKAFS_OSTYPE=NBSD
 		AC_MSG_RESULT(nbsd)
@@ -354,6 +358,12 @@
 			vm=${v#*.}
 			AFS_SYSNAME="i386_fbsd_${vM}${vm}"
 			;;
+		x86_64-*-freebsd?.*)
+			v=${host#*freebsd}
+			vM=${v%.*}
+			vm=${v#*.}
+			AFS_SYSNAME="amd64_fbsd_${vM}${vm}"
+			;;
 		i?86-*-netbsd*1.5*)
 			AFS_PARAM_COMMON=param.nbsd15.h
 			AFS_SYSNAME="i386_nbsd15"