diff --git a/configuration.org b/configuration.org
index fbd0c52..5098513 100644
--- a/configuration.org
+++ b/configuration.org
@@ -3679,6 +3679,14 @@ directory.  It is available from [[http://plantuml.com/download][here]].
 (use-package flycheck-rust)
 #+END_SRC
 
+** Fish shell
+
+#+BEGIN_SRC emacs-lisp
+(use-package fish-mode
+  :hook
+  (fish-mode . (lambda () (add-hook 'before-save-hook 'fish_indent-before-save))))
+#+END_SRC
+
 * Games
 
 ** Gnu Go
diff --git a/customizations.el b/customizations.el
index 894f0b2..284489f 100644
--- a/customizations.el
+++ b/customizations.el
@@ -86,6 +86,7 @@
      expand-region
      fancy-narrow
      feature-mode
+     fish-mode
      flycheck
      flycheck-pkg-config
      flycheck-rust