--- build-aux/ltmain.in.orig	2015-02-06 13:57:56.000000000 +0100
+++ build-aux/ltmain.in	2017-02-03 06:41:51.603073000 +0100
@@ -5107,7 +5107,7 @@
 	    # These systems don't actually have a C library (as such)
 	    test X-lc = "X$arg" && continue
 	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
+	  *-*-openbsd* | *-*-bsdsunix* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
 	    # Do not include libc due to us having libc/libc_r.
 	    test X-lc = "X$arg" && continue
 	    ;;
@@ -5127,7 +5127,7 @@
 	  esac
 	elif test X-lc_r = "X$arg"; then
 	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
+	 *-*-openbsd* | *-*-bsdsunix* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
 	   # Do not include libc_r directly, use -pthread flag.
 	   continue
 	   ;;
@@ -6904,6 +6904,17 @@
 	    revision=$number_minor
 	    age=0
 	    ;;
+	  bsdsunix-elf)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age=$number_minor
+	    revision=$number_revision
+	    ;;
+	  bsdsunix-aout)
+	    current=$number_major
+	    revision=$number_minor
+	    age=0
+	    ;;
 	  irix|nonstopux)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
@@ -6979,6 +6990,17 @@
           esac
 	  ;;
 
+	bsdsunix-aout)
+	  major=.$current
+	  versuffix=.$current.$revision
+	  ;;
+
+	bsdsunix-elf)
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=$major.$age.$revision
+	  ;;
+
 	freebsd-aout)
 	  major=.$current
 	  versuffix=.$current.$revision
@@ -7210,7 +7232,7 @@
 	  *-*-netbsd*)
 	    # Don't link with libc until the a.out ld.so is fixed.
 	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	  *-*-openbsd* | *-*-bsdsunix* | *-*-freebsd* | *-*-dragonfly*)
 	    # Do not include libc due to us having libc/libc_r.
 	    ;;
 	  *-*-sco3.2v5* | *-*-sco5v6*)