diff --git a/CHANGES b/CHANGES
index c1a7c6c..ffcf2fe 100644
--- a/CHANGES
+++ b/CHANGES
@@ -89,6 +89,7 @@ Corrections:
 	name to decide if it is an IPv4 address. This was not RFC conform. This
 	fix removes the possibility for use of IPv4 addresses with IPv6, e.g.
 	TCP6:127.0.0.1:80
+	Debian issue 695885
 	Thanks to Nicolas Fournil for reporting this issue.
 
 	Print a useful error message when single character options appear to be
diff --git a/Makefile.in b/Makefile.in
index 11a5824..53dd76f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -49,7 +49,6 @@ XIOSRCS = xioinitialize.c xiohelp.c xioparam.c xiodiag.c xioopen.c xioopts.c \
 	xio-ip.c xio-ip4.c xio-ip6.c xio-ipapp.c xio-tcp.c \
 	xio-sctp.c xio-rawip.c \
 	xio-socks.c xio-proxy.c xio-udp.c \
-	xio-rawip.c \
 	xio-progcall.c xio-exec.c xio-system.c xio-termios.c xio-readline.c \
 	xio-pty.c xio-openssl.c xio-streams.c\
 	xio-ascii.c xiolockfile.c xio-tcpwrap.c xio-ext2.c xio-tun.c
diff --git a/test.sh b/test.sh
index f2c4473..7f073bf 100755
--- a/test.sh
+++ b/test.sh
@@ -183,7 +183,7 @@ if ! type usleep >/dev/null 2>&1 ||
 fi
 #USLEEP=usleep
 
-if type ping6; then
+if type ping6 >/dev/null 2>&1; then
     PING6=ping6
 else
     PING6="ping -6"
@@ -13020,7 +13020,7 @@ N=$((N+1))
 
 NAME=SOCAT_OPT_HINT
 case "$TESTS" in
-*%$N%*|*%socat%*|*%$NAME%*)
+*%$N%*|*%functions%*|*%$NAME%*)
 TEST="$NAME: check if merging single character options is rejected"
 if ! eval $NUMCOND; then :; else
 te="$td/test$N.stderr"
@@ -13057,8 +13057,10 @@ te="$td/test$N.stderr"
 tdiff="$td/test$N.diff"
 da="test$N $(date) $RANDOM"
 CMD0="$TRACE $SOCAT $opts -T 1 STDIO,echo=0 EXEC:cat"
+echo "$CMD0" >$td/test$N.sh
+chmod a+x $td/test$N.sh
 printf "test $F_n $TEST... " $N
-$CMD0 2>"${te}0"
+$SOCAT /dev/null EXEC:$td/test$N.sh,pty 2>"${te}0"
 rc0=$?
 if [ $rc0 -eq 0 ]; then
     $PRINTF "$OK\n"
@@ -13066,6 +13068,7 @@ if [ $rc0 -eq 0 ]; then
 else
     $PRINTF "$FAILED\n"
     echo "$CMD0"
+    cat "${te}0"
     numFAIL=$((numFAIL+1))
     listFAIL="$listFAIL $N"
 fi