diff --git a/plugins.md b/plugins.md
index cea4504deb004f0c462e88d623925cb0db34a8cc..3f1007888c48d6f6553d9b03e00f3508dd1f5fb2 100644
--- a/plugins.md
+++ b/plugins.md
@@ -247,7 +247,7 @@ Since Ion does not support autocompletion via plugins, a lot of oh-my-zsh plugin
 |--------------------------+--------------------------------|
 | jenv                     | Low priority                   |
 |--------------------------+--------------------------------|
-| jhbuild                  | Planned                        |
+| jhbuild                  | Done                           |
 |--------------------------+--------------------------------|
 | jira                     | Planned                        |
 |--------------------------+--------------------------------|
diff --git a/tools/jhbuild.ion b/tools/jhbuild.ion
new file mode 100644
index 0000000000000000000000000000000000000000..78d4e364bea135c9f114a724f09ee81ce4ad3458
--- /dev/null
+++ b/tools/jhbuild.ion
@@ -0,0 +1,29 @@
+# This plugin adds some jhbuild aliases and increase the completion function provided by zsh.
+# ## Based upon the work of [Miguel Vaello](https://github.com/miguxbe)
+
+alias jh='jhbuild'
+# Build
+alias jhb='jhbuild build'
+alias jhbo='jhbuild buildone'
+# Checks
+alias jhckb='jhbuild checkbranches'
+alias jhckm='jhbuild checkmodulesets'
+# Info & list
+alias jhi='jhbuild info'
+alias jhl='jhbuild list'
+# Clean
+alias jhc='jhbuild clean'
+alias jhco='jhbuild cleanone'
+# Run
+alias jhr='jhbuild run'
+# Depends
+alias jhrd='jhbuild rdepends'
+alias jhsd='jhbuild sysdeps'
+# Update
+alias jhu='jhbuild update'
+alias jhuo='jhbuild updateone'
+# Uninstall
+alias jhun='jhbuild uninstall'
+
+
+