diff --git a/bin/any-nix-shell b/bin/any-nix-shell
index 651cd3d..a860e8b 100755
--- a/bin/any-nix-shell
+++ b/bin/any-nix-shell
@@ -80,6 +80,44 @@ EOF
     done
 }
 
+function init_elvish() {
+                output+=$(cat <<EOF
+# If you see this output, you probably forgot to 'eval' it:
+# eval (any-nix-shell $@ | slurp)
+
+# Overwrite the nix-shell command
+edit:add-var nix-shell~ [@_args]{
+    $(which .any-nix-shell-wrapper) elvish \$@_args
+}
+
+# Overwrite the nix command
+edit:add-var nix~ [cmd @_args]{
+    if (==s \$cmd shell) {
+        $(which .any-nix-wrapper) elvish \$@_args
+    } else {
+        command nix \$cmd \$@_args
+    }
+}
+EOF
+                )
+    for arg in "$@"; do
+        case "$arg" in
+            --info-right)
+                output+=$(cat <<EOF
+
+
+# Print additional information inside a nix-shell environment
+edit:rprompt = {
+    print ($(which nix-shell-info) | slurp)" "
+}
+
+EOF
+                );;
+            *) error;;
+        esac
+    done
+}
+
 function error () {
     echo "echo ERROR: wrong usage"
     echo "bash -c \"\$(exit 1)\""
@@ -93,6 +131,7 @@ output=
 case "$1" in
     fish) init_fish "${@:2}";;
     zsh) init_zsh "${@:2}";;
+    elvish) init_elvish "${@:2}";;
     *) error;;
 esac