2 files changed, 12 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 5f086f76e..2b2948c15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20130801
+ - (djm) [regress/multiplex.sh] Skip test for non-OpenBSD netcat. We need
+   a better solution, but this will have to do for now.
+
 20140730
  - OpenBSD CVS Sync
    - millert@cvs.openbsd.org 2014/07/24 22:57:10
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index 693211bff..377281a0c 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -8,11 +8,15 @@ tid="connection multiplexing"
 if have_prog nc ; then
         if nc -h 2>&1 | grep -- -N >/dev/null; then
                 NC="nc -N";
-        else
+        elif nc -h 2>&1 | grep -- "-U.*Use UNIX" >/dev/null ; then
                 NC="nc"
-        fi
-else
-        echo "skipped (no nc found)"
+        else
+                echo "nc is incompatible"
+        fi
+fi
+
+if test -z "$NC" ; then
+        echo "skipped (no compatible nc found)"
         exit 0
 fi