diff --git a/CHANGES b/CHANGES
index 7409edf7..9d8196a4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -64,6 +64,7 @@ bash-completion (1.x)
   * Better xhost completion
   * Split _known_hosts completion in two parts, to avoid parsing command line
     twice
+  * Added strace completion
 
   [ Raphaël Droz ]
   * Add mount -L and -U completion.
diff --git a/contrib/strace b/contrib/strace
new file mode 100644
index 00000000..bf9878f4
--- /dev/null
+++ b/contrib/strace
@@ -0,0 +1,99 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 noet filetype=sh
+#
+# bash completion for strace
+
+have strace && 
+_strace()
+{
+	local cur prev offset i syscalls arch unistd
+
+	# check if we're still completing strace
+	offset=0
+	for (( i=1; i <= COMP_CWORD; i++ )); do
+		case ${COMP_WORDS[$i]} in
+			-@(o|e|p))
+				i=$((i+1))
+				continue
+				;;
+			-*)
+				continue
+				;;
+		esac
+		offset=$i
+		break
+	done
+
+	if [ $offset -gt 0 ]; then
+		# FAIL: _command_offset is not defined anywhere. Guillame?
+		_command_offset $offset
+	else
+
+		COMPREPLY=()
+		cur=`_get_cword`
+		prev=${COMP_WORDS[COMP_CWORD-1]}
+
+		case $prev in
+		-e)
+			if [[ "$cur" == *=* ]]; then
+				prev=${cur/=*/}
+				cur=${cur/*=/}
+				
+				# Import arch-specific syscalls -- not foolproof IMHO
+				#+                                     --David Paleino
+				arch=$(command uname -m)
+				syscalls=$(awk '/^#define __NR/ {print $2}' \
+					/usr/include/asm/unistd.h | sed -e \
+					's/__NR_//')
+				if [ -z "$syscalls" ]; then
+					if [[ "$arch" =~ 86$ ]]; then
+						unistd=/usr/include/asm/unistd_32.h
+					else
+						unistd=/usr/include/asm/unistd_64.h
+					fi
+					syscalls=$(awk '/^#define __NR/ {print $2}' \
+						$unistd | sed -e 's/__NR_//')
+				fi
+
+				case $prev in
+					trace)
+						COMPREPLY=( $( compgen -W "$syscalls file process \
+							network signal ipc desc all none" -- $cur) )
+						return 0
+						;;
+				esac
+			else
+				COMPREPLY=( $( compgen -S"=" -W 'trace abbrev \
+					verbose raw signal read write' \
+					-- $cur ) )
+			fi
+			return 0
+			;;
+		-o)
+			_filedir
+			return 0
+			;;
+		-p)
+			_pids
+			return 0
+			;;
+		-S)
+			COMPREPLY=( $( compgen -W 'time calls name nothing' -- $cur ) )
+			return 0
+			;;
+		-u)
+			COMPREPLY=( $( compgen -u -- $cur ) )
+			return 0
+			;;
+		esac
+
+		if [[ "$cur" == -* ]]; then
+			COMPREPLY=( $( compgen -W '-c -d -f -ff -F -h --help -i -q \
+				-r -t -tt -ttt -T -v -V -x -xx -a -e -o -O -p \
+				-s -S -u -E' -- $cur ) )
+		else
+			COMPREPLY=( $( compgen -c -- $cur ) )
+		fi
+	fi
+} &&
+complete -F _strace $default strace