diff --git a/git-flow-completion.bash b/git-flow-completion.bash
index c4fefec..e535ad4 100755
--- a/git-flow-completion.bash
+++ b/git-flow-completion.bash
@@ -154,7 +154,7 @@ __git_flow_release ()
 
 __git_flow_hotfix ()
 {
-	local subcommands="list start finish help"
+	local subcommands="list start finish track publish help"
 	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 	if [ -z "$subcommand" ]; then
 		__gitcomp "$subcommands"
@@ -166,6 +166,14 @@ __git_flow_hotfix ()
 		__gitcomp "$(__git_flow_list_branches 'hotfix')"
 		return
 		;;
+	publish)
+		__gitcomp "$(comm -23 <(__git_flow_list_branches 'hotfix') <(__git_flow_list_remote_branches 'hotfix'))"
+		return
+		;;
+	track)
+		__gitcomp "$(comm -23 <(__git_flow_list_remote_branches 'hotfix') <(__git_flow_list_branches 'hotfix'))"
+		return
+		;;
 	*)
 		COMPREPLY=()
 		;;