diff --git a/ansible/main.yml b/ansible/main.yml
index 280fc6da..bca4c524 100644
--- a/ansible/main.yml
+++ b/ansible/main.yml
@@ -22,3 +22,5 @@
     - dotfiles
     - ruby
     - zsh
+
+# - import_playbook: playbooks/fish.yml
diff --git a/ansible/playbooks/fish.yml b/ansible/playbooks/fish.yml
new file mode 100644
index 00000000..98cd9568
--- /dev/null
+++ b/ansible/playbooks/fish.yml
@@ -0,0 +1,19 @@
+- hosts: all
+  tasks:
+
+  - name: install fish
+    package:
+      name: fish
+      state: present
+
+  - name: find where fish is
+    command: which fish
+    register: which_fish
+
+  - name: add fish to /etc/shells
+    lineinfile: dest=/etc/shells line={{ which_fish.stdout | trim }} state=present
+    become: yes
+
+  - name: set the default user shell to fish
+    user: name={{ ansible_env.USER }} shell={{ which_fish.stdout | trim }}
+    become: yes