--- aclocal.m4.orig	2016-10-03 13:53:51.015544000 +0200
+++ aclocal.m4	2016-10-03 13:54:27.718953000 +0200
@@ -1268,7 +1268,7 @@
 
 if test "$cf_result" = no ; then
 case $host_os in #(vi
-freebsd*) #(vi
+bsdsunix*|freebsd*) #(vi
     AC_CHECK_LIB(mytinfo,tgoto,[CF_ADD_LIBS(-lmytinfo)])
     ;;
 hpux10.*) #(vi
@@ -2410,7 +2410,7 @@
 openbsd[[2-9]].*|mirbsd*) #(vi
 	LD_RPATH_OPT="-Wl,-rpath,"
 	;;
-dragonfly*|freebsd*) #(vi
+dragonfly*|bsdsunix*|freebsd*) #(vi
 	LD_RPATH_OPT="-rpath "
 	;;
 netbsd*) #(vi
@@ -2881,7 +2881,7 @@
 		[cf_ncurses_LIBS="-lgpm"])])
 
 case $host_os in #(vi
-freebsd*)
+bsdsunix*|freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	if test "$cf_nculib_root" = ncurses ; then
@@ -4078,7 +4078,7 @@
 	cf_xopen_source="-D_DARWIN_C_SOURCE"
 	cf_XOPEN_SOURCE=
 	;;
-freebsd*|dragonfly*) #(vi
+bsdsunix*|freebsd*|dragonfly*) #(vi
 	# 5.x headers associate
 	#	_XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
 	#	_XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L
--- config.guess.orig	2016-10-03 14:06:01.850623000 +0200
+++ config.guess	2016-10-03 14:09:20.355833000 +0200
@@ -791,6 +791,16 @@
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
+    *:BSDSUniX:*:*)
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-bsdsunix`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-bsdsunix`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-bsdsunix`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
     *:FreeBSD:*:*)
 	case ${UNAME_MACHINE} in
 	    pc98)
--- config.sub.orig	2016-10-03 14:03:14.409427000 +0200
+++ config.sub	2016-10-03 14:04:57.327421000 +0200
@@ -1330,7 +1330,7 @@
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
+	      | -openbsd* | -solidbsd* | -bsdsunix* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
--- configure.orig	2016-10-03 13:51:49.685872000 +0200
+++ configure	2016-10-03 13:53:11.035228000 +0200
@@ -2879,7 +2879,7 @@
 	cf_xopen_source="-D_DARWIN_C_SOURCE"
 	cf_XOPEN_SOURCE=
 	;;
-freebsd*|dragonfly*) #(vi
+bsdsunix*|freebsd*|dragonfly*) #(vi
 	# 5.x headers associate
 	#	_XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
 	#	_XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L
@@ -10921,7 +10921,7 @@
 fi
 
 case $host_os in #(vi
-freebsd*)
+bsdsunix*|freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	if test "$cf_nculib_root" = ncurses ; then
@@ -11641,7 +11641,7 @@
 
 if test "$cf_result" = no ; then
 case $host_os in #(vi
-freebsd*) #(vi
+bsdsunix*|freebsd*) #(vi
     echo "$as_me:11645: checking for tgoto in -lmytinfo" >&5
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
@@ -14351,7 +14351,7 @@
 openbsd[2-9].*|mirbsd*) #(vi
 	LD_RPATH_OPT="-Wl,-rpath,"
 	;;
-dragonfly*|freebsd*) #(vi
+dragonfly*|bsdsunix*|freebsd*) #(vi
 	LD_RPATH_OPT="-rpath "
 	;;
 netbsd*) #(vi