@@ -2599,6 +2599,8 @@ _docker_service() {

 		ps

 		update

 	"

+	__docker_daemon_is_experimental && subcommands+="logs"

+

 	__docker_subcommands "$subcommands" && return

 	case "$cur" in

@@ -2631,6 +2633,26 @@ _docker_service_inspect() {

 	esac

 }

+_docker_service_logs() {

+	case "$prev" in

+		--since|--tail)

+			return

+			;;

+	esac

+

+	case "$cur" in

+		-*)

+			COMPREPLY=( $( compgen -W "--details --follow -f --help --no-resolve --since --tail --timestamps -t" -- "$cur" ) )

+			;;

+		*)

+			local counter=$(__docker_pos_first_nonflag '--since|--tail')

+			if [ $cword -eq $counter ]; then

+				__docker_complete_services

+			fi

+			;;

+	esac

+}

+

 _docker_service_list() {

 	_docker_service_ls

 }