diff --git a/plugins.md b/plugins.md
index c902d17912f07de3b67732f531cc73eeb9676995..e334e5ece93ed5c22abdf014834fb04d4936e1bf 100644
--- a/plugins.md
+++ b/plugins.md
@@ -199,7 +199,7 @@ Since Ion does not support autocompletion via plugins, a lot of oh-my-zsh plugin
 |--------------------------+--------------------------------|
 | github                   | Planned                        |
 |--------------------------+--------------------------------|
-| git-hubflow              | Planned                        |
+| git-hubflow              | Done                           |
 |--------------------------+--------------------------------|
 | gitignore                | Not sure                       |
 |--------------------------+--------------------------------|
diff --git a/tools/git-hubflow.ion b/tools/git-hubflow.ion
new file mode 100644
index 0000000000000000000000000000000000000000..bed2fd48f286f7048fe92b17edab11de79f1b6fa
--- /dev/null
+++ b/tools/git-hubflow.ion
@@ -0,0 +1,14 @@
+# # git-hubflow plugin
+#
+# This plugin adds completion for [HubFlow](https://datasift.github.io/gitflow/) (GitFlow for GitHub), as well as some
+# aliases for common commands. HubFlow is a git extension to make it easy to use GitFlow with GitHub. Based on the
+# original gitflow extension for git.
+#
+# The hubflow tool has to be [installed](https://github.com/datasift/gitflow#installation) separately.
+
+alias ghf='git hf'
+alias ghff='git hf feature'
+alias ghfr='git hf release'
+alias ghfh='git hf hotfix'
+alias ghfs='git hf support'
+alias ghfu='git hf update'