diff --git a/libexec/scalaenv-init b/libexec/scalaenv-init
index 1ffdd88..9618609 100755
--- a/libexec/scalaenv-init
+++ b/libexec/scalaenv-init
@@ -102,7 +102,14 @@ if [ -r "$completion" ]; then
 fi
 
 if [ -z "${no_rehash}" ]; then
-  echo 'command scalaenv rehash 2>/dev/null'
+  case "$shell" in
+    fish )
+      echo 'true (command scalaenv rehash 2>/dev/null &)'
+      ;;
+    * )
+      echo '(command scalaenv rehash 2>/dev/null &)'
+      ;;
+  esac
 fi
 
 commands=(`scalaenv-commands --sh`)
diff --git a/plugins/scala-install/bin/scalaenv-install b/plugins/scala-install/bin/scalaenv-install
index f856979..31c61f8 100755
--- a/plugins/scala-install/bin/scalaenv-install
+++ b/plugins/scala-install/bin/scalaenv-install
@@ -63,8 +63,7 @@ usage () {
 }
 
 definitions() {
-  local query="$1"
-  scala-build --definitions | $(type -p ggrep grep | head -1) -F "$query" || true
+  ls -1 "$(abs_dirname $0/../../share/)" | grep -v '^d'
 }
 
 indent() {
diff --git a/plugins/scala-install/share/dotty-0.3.0-RC1 b/plugins/scala-install/share/dotty-0.3.0-RC1
new file mode 100644
index 0000000..eb2de62
--- /dev/null
+++ b/plugins/scala-install/share/dotty-0.3.0-RC1
@@ -0,0 +1,4 @@
+sites=(
+    "https://github.com/lampepfl/dotty/releases/download/0.3.0-RC1"
+    );
+archive_file="dotty-0.3.0-RC1.tar.gz"
diff --git a/plugins/scala-install/share/dotty-0.3.0-RC2 b/plugins/scala-install/share/dotty-0.3.0-RC2
new file mode 100644
index 0000000..3e71b41
--- /dev/null
+++ b/plugins/scala-install/share/dotty-0.3.0-RC2
@@ -0,0 +1,4 @@
+sites=(
+    "https://github.com/lampepfl/dotty/releases/download/0.3.0-RC2"
+    );
+archive_file="dotty-0.3.0-RC2.tar.gz"
diff --git a/plugins/scala-install/share/dotty-0.4.0-RC1 b/plugins/scala-install/share/dotty-0.4.0-RC1
new file mode 100644
index 0000000..b1d3ad4
--- /dev/null
+++ b/plugins/scala-install/share/dotty-0.4.0-RC1
@@ -0,0 +1,4 @@
+sites=(
+    "https://github.com/lampepfl/dotty/releases/download/0.4.0-RC1"
+    );
+archive_file="dotty-0.4.0-RC1.tar.gz"
diff --git a/plugins/scala-install/share/dotty-0.5.0-RC1 b/plugins/scala-install/share/dotty-0.5.0-RC1
new file mode 100644
index 0000000..0aa431b
--- /dev/null
+++ b/plugins/scala-install/share/dotty-0.5.0-RC1
@@ -0,0 +1,4 @@
+sites=(
+    "https://github.com/lampepfl/dotty/releases/download/0.5.0-RC1"
+    );
+archive_file="dotty-0.5.0-RC1.tar.gz"
diff --git a/plugins/scala-install/share/scala-2.12.5 b/plugins/scala-install/share/scala-2.12.5
new file mode 100644
index 0000000..b610d81
--- /dev/null
+++ b/plugins/scala-install/share/scala-2.12.5
@@ -0,0 +1,4 @@
+sites=(
+    "http://www.scala-lang.org/files/archive"
+    );
+archive_file="scala-2.12.5.tgz"
diff --git a/plugins/scala-install/share/scala-2.12.6 b/plugins/scala-install/share/scala-2.12.6
new file mode 100644
index 0000000..d937a7f
--- /dev/null
+++ b/plugins/scala-install/share/scala-2.12.6
@@ -0,0 +1,4 @@
+sites=(
+    "http://www.scala-lang.org/files/archive"
+    );
+archive_file="scala-2.12.6.tgz"
diff --git a/plugins/scala-install/share/scala-2.13.0-M4 b/plugins/scala-install/share/scala-2.13.0-M4
new file mode 100644
index 0000000..acd6e35
--- /dev/null
+++ b/plugins/scala-install/share/scala-2.13.0-M4
@@ -0,0 +1,4 @@
+sites=(
+    "http://www.scala-lang.org/files/archive"
+    );
+archive_file="scala-2.13.0-M4.tgz"
diff --git a/test/init.bats b/test/init.bats
old mode 100644
new mode 100755
index e1b8f0d..8c5c568
--- a/test/init.bats
+++ b/test/init.bats
@@ -12,9 +12,15 @@ load test_helper
 }
 
 @test "auto rehash" {
-  run scalaenv-init -
+  run scalaenv-init - bash
+  assert_success
+  assert_line "(command scalaenv rehash 2>/dev/null &)"
+}
+
+@test "auto rehash (fish)" {
+  run scalaenv-init - fish
   assert_success
-  assert_line "command scalaenv rehash 2>/dev/null"
+  assert_line "true (command scalaenv rehash 2>/dev/null &)"
 }
 
 @test "detect parent shell" {