diff --git a/CHANGES b/CHANGES
index 91a7736b..1956f53b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -92,6 +92,7 @@ bash-completion (1.x)
     to get various completions instead of simply "mplayer" or "mencoder".
   * Associate OOXML/MS Office 2007 extensions with OpenOffice applications.
   * Associate .tsv with oocalc.
+  * Add xmlwf completion.
 
   [ Todd Zullinger ]
   * Make yum complete on filenames after install, deplist, update and upgrade
diff --git a/Makefile.am b/Makefile.am
index 56ae5ac9..3c808914 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -137,6 +137,7 @@ bashcomp_DATA = contrib/ant \
 		contrib/xhost \
 		contrib/xm \
 		contrib/xmllint \
+		contrib/xmlwf \
 		contrib/xmms \
 		contrib/xrandr \
 		contrib/yp-tools \
diff --git a/contrib/xmlwf b/contrib/xmlwf
new file mode 100644
index 00000000..97e9bbd8
--- /dev/null
+++ b/contrib/xmlwf
@@ -0,0 +1,35 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 noet filetype=sh
+#
+# bash completion for xmlwf(1)
+
+have xmlwf &&
+_xmlwf()
+{
+	local cur prev
+
+	COMPREPLY=()
+	cur=`_get_cword`
+	prev=${COMP_WORDS[COMP_CWORD-1]}
+
+	case "$prev" in
+		-d)
+			_filedir -d
+			return 0
+			;;
+		-e)
+			COMPREPLY=( $( compgen -W 'US-ASCII UTF-8 UTF-16 \
+				ISO-8859-1' -- $cur ) )
+			return 0
+			;;
+	esac
+
+	if [[ "$cur" == -* ]]; then
+		COMPREPLY=( $( compgen -W '-c -d -e -m -n -p -r -s -t -v -w \
+			-x' -- $cur ) )
+		return 0
+	fi
+
+	_filedir '@(*ml|htm|svg)'
+} &&
+complete -F _xmlwf $filenames xmlwf