diff --git a/contrib/gkrellm b/contrib/gkrellm
new file mode 100644
index 00000000..9964b2b0
--- /dev/null
+++ b/contrib/gkrellm
@@ -0,0 +1,34 @@
+# gkrellm(1) completion by Guillaume Rousse <rousse@ccr.jussieu.fr>
+#
+_gkrellm()
+{
+	local cur
+
+	COMPREPLY=()
+	cur=${COMP_WORDS[COMP_CWORD]}
+	prev=${COMP_WORDS[COMP_CWORD-1]}
+
+	case "$prev" in
+		-@(t|-theme))
+			_filedir -d
+			return 0
+			;;
+		-@(p|-plugin))
+			_filedir 'so'
+			return 0
+			;;
+		-@(s|-server))
+			_known_hosts
+			return 0
+			;;
+	esac
+
+	if [[ "$cur" == -* ]]; then
+		COMPREPLY=( $( compgen -W '--help -t --theme -s --server \
+			-g --geometry -wm -w --withdrawn -c --config -nc \
+			-f --force-host-config -demo -p --plugin -P \
+			--port' -- $cur ) )
+	fi
+
+}
+complete -F _gkrellm gkrellm