--- a/bash-completion.sh	Fri Jul 29 18:03:49 2022 +0200
+++ b/bash-completion.sh	Sat Jul 30 00:16:40 2022 +0200
@@ -29,26 +29,39 @@
 		"uds:///tmp/relpipe.socket"
 	)
 
-	CONNECTION_OPTIONS=(
+	OPTIONS=(
+		"protocol"
 		"role"
 		"mode"
+		"host"
+		"port"
+		"path"
 	)
 
-	CONNECTION_ROLES=(
+	PROTOCOLS=(
+		"tcp"
+		"udp"
+		"uds"
+		"sctp"
+	)
+
+	ROLES=(
 		"client"
 		"server"
 	)
 
-	CONNECTION_MODES=(
+	MODES=(
 		"stream"
 		"datagram"
 	)
 
 	if   [[ "$w1" == "--relation"                      && "x$w0" == "x" ]];    then COMPREPLY=("''")
 	elif [[ "$w1" == "--connection-string"                              ]];    then COMPREPLY=($(compgen -W "${CONNECTION_STRINGS[*]}" -- "$w0"))
-	elif [[ "$w1" == "--connection-option"                              ]];    then COMPREPLY=($(compgen -W "${CONNECTION_OPTIONS[*]}" -- "$w0"))
-	elif [[ "$w2" == "--connection-option" && "$w1" == "role"           ]];    then COMPREPLY=($(compgen -W "${CONNECTION_ROLES[*]}" -- "$w0"))
-	elif [[ "$w2" == "--connection-option" && "$w1" == "mode"           ]];    then COMPREPLY=($(compgen -W "${CONNECTION_MODES[*]}" -- "$w0"))
+	elif [[ "$w1" == "--connection-option"                              ]];    then COMPREPLY=($(compgen -W "${OPTIONS[*]}" -- "$w0"))
+	elif [[ "$w2" == "--connection-option" && "$w1" == "protocol"       ]];    then COMPREPLY=($(compgen -W "${PROTOCOLS[*]}" -- "$w0"))
+	elif [[ "$w2" == "--connection-option" && "$w1" == "role"           ]];    then COMPREPLY=($(compgen -W "${ROLES[*]}" -- "$w0"))
+	elif [[ "$w2" == "--connection-option" && "$w1" == "mode"           ]];    then COMPREPLY=($(compgen -W "${MODES[*]}" -- "$w0"))
+	elif [[ "$w2" == "--connection-option" && "$w1" == "path"           ]];    then COMPREPLY=($(compgen -f -- "$w0"))
 	else
 		OPTIONS=(
 			"--relation"