diff --git a/README.md b/README.md
index 961d52f..916cfc5 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 This is a collection of config files and scripts designed to get
 a vanilla Ubuntu server up to working speed as quickly as possible.
 
-Download this git repository by forking
+Download this git repository by cloning
 `http://git.synoikos.de/git/daniel/server-setup.git`, then run `setup.sh`.
 
 ## Contents

diff --git a/README.md b/README.md
index 961d52f..916cfc5 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 This is a collection of config files and scripts designed to get
 a vanilla Ubuntu server up to working speed as quickly as possible.
 
-Download this git repository by forking
+Download this git repository by cloning
 `http://git.synoikos.de/git/daniel/server-setup.git`, then run `setup.sh`.
 
 ## Contents
diff --git a/setup.sh b/setup.sh
index e82e2b5..c4f4006 100644
--- a/setup.sh
+++ b/setup.sh
@@ -15,6 +15,9 @@
 cp -v init.el ~/.emacs.d/
 cp -v config ~/.ssh/
 
+echo "Setting up fish shell..."
+chsh -s /usr/bin/fish
+
 echo "Installing Julia v0.6.3 to /usr/local/lib..."
 wget https://julialang-s3.julialang.org/bin/linux/x64/0.6/julia-0.6.3-linux-x86_64.tar.gz
 tar xzf julia-0.6.3-linux-x86_64.tar.gz