diff --git a/x-plane/default.nix b/x-plane/default.nix
index 6fd5732..08375e4 100644
--- a/x-plane/default.nix
+++ b/x-plane/default.nix
@@ -195,17 +195,24 @@ in buildFHSUserEnv rec {
                      [ stdenv.cc.cc.lib curl openssl ] ++
                      # For fly with lua
                      [ freeglut libudev ]);
+
   extraBuildCommands = ''
     chmod u+w $out/etc
     mkdir $out/etc/openal
     chmod u-w $out/etc
     echo "drivers=pulse" > $out/etc/openal/alsoft.conf
-    mkdir $out/xplane-extra
+    mkdir -p $out/xplane-extra
   '' + (concatMapStrings (addon:
          optionalString (addon.passthru ? build) ''
            ADDONPATH=${addon}
            printf "Addon ${addon.pname}\n" >&2
            ${addon.passthru.build}
          '') uniqueAddons);
+
+  extraInstallCommands = ''
+    mkdir -p $out/share/zsh/site-functions
+    ln -s ${./x-plane-env.zcomp} $out/share/zsh/site-functions/_x-plane-env
+  '';
+
   inherit runScript;
 }
diff --git a/x-plane/x-plane-env.zcomp b/x-plane/x-plane-env.zcomp
new file mode 100644
index 0000000..eccc30a
--- /dev/null
+++ b/x-plane/x-plane-env.zcomp
@@ -0,0 +1,10 @@
+#compdef x-plane-env
+
+_x-plane-env() {
+    local descr ret=1
+    local -a context line state state_descr
+    local -A opt_args
+
+    _arguments : '--help:' \
+        '1:action:(X-Plane Airfoil Plane Installer SHELL prepare ortho revert navdata)'
+}