diff --git a/README.markdown b/README.markdown
index 33463ad..8d0c5f9 100644
--- a/README.markdown
+++ b/README.markdown
@@ -15,7 +15,7 @@
 
 To achieve git-flow completion nirvana:
 
- 0. Install git-completion.
+ 0. [Install git-completion](http://github.com/bobthecow/git-flow-completion/wiki/Install-Bash-git-completion).
 
  1. Install this file. Either:
 
diff --git a/git-flow-completion.bash b/git-flow-completion.bash
index 8140fae..276c30d 100755
--- a/git-flow-completion.bash
+++ b/git-flow-completion.bash
@@ -110,7 +110,7 @@
 		return
 		;;
 	track)
-		__gitcomp "$(__git_flow_list_remote_branches 'feature')"
+		__gitcomp "$(comm -23 <(__git_flow_list_remote_branches 'feature') <(__git_flow_list_branches 'feature'))"
 		return
 		;;
 	*)
@@ -138,7 +138,7 @@
 		return
 		;;
 	track)
-		__gitcomp "$(__git_flow_list_remote_branches 'release')"
+		__gitcomp "$(comm -23 <(__git_flow_list_remote_branches 'release') <(__git_flow_list_branches 'release'))"
 		return
 		;;
 	*)
@@ -150,7 +150,7 @@
 
 __git_flow_hotfix ()
 {
-	local subcommands="list start finish track publish help"
+	local subcommands="list start finish help"
 	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 	if [ -z "$subcommand" ]; then
 		__gitcomp "$subcommands"
@@ -162,14 +162,6 @@
 		__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 "$(__git_flow_list_remote_branches 'hotfix')"
-		return
-		;;
 	*)
 		COMPREPLY=()
 		;;