diff --git a/doc/FAQ.org b/doc/FAQ.org
index 0248f9e67..b33c7fef3 100644
--- a/doc/FAQ.org
+++ b/doc/FAQ.org
@@ -219,6 +219,13 @@ the =~/.terminfo= yourself.
 tic -o ~/.terminfo $TERMINFO/e/eterm-color.ti
 #+END_SRC
 
+Note that =eterm-color.ti= may be at a different location, to find out the exact
+location you may try to use =locate=:
+
+#+BEGIN_SRC fish
+locate eterm-color.ti
+#+END_SRC
+
 ** Why are my font settings not being respected?
 The settings of =dotspacemacs-default-font= (such as size, weight, etc.) will
 only be applied if the name of the font exists on your system. Check to make
diff --git a/layers/+tools/shell/README.org b/layers/+tools/shell/README.org
index dbdc35b2d..65beeefd1 100644
--- a/layers/+tools/shell/README.org
+++ b/layers/+tools/shell/README.org
@@ -5,13 +5,14 @@
 * Table of Contents                                         :TOC_4_gh:noexport:
  - [[#description][Description]]
  - [[#install][Install]]
-   - [[#layer][Layer]]
+ - [[#configuration][Configuration]]
    - [[#default-shell][Default shell]]
    - [[#default-shell-position-and-height][Default shell position and height]]
    - [[#set-shell-for-term-and-ansi-term][Set shell for term and ansi-term]]
    - [[#width-of-the-shell-popup-buffers][Width of the shell popup buffers]]
    - [[#enable-em-smart-in-eshell][Enable em-smart in Eshell]]
    - [[#protect-your-eshell-prompt][Protect your Eshell prompt]]
+   - [[#fish-shell-and-ansi-term][Fish shell and ansi-term]]
  - [[#eshell][Eshell]]
  - [[#key-bindings][Key bindings]]
    - [[#multi-term][Multi-term]]
@@ -21,11 +22,11 @@
 This layer configures the various shells available in Emacs.
 
 * Install
-** Layer
 To use this configuration layer, add it to your =~/.spacemacs=. You will need to
 add =shell= to the existing =dotspacemacs-configuration-layers= list in this
 file.
 
+* Configuration
 ** Default shell
 Emacs supports three types of shell:
 - the Emacs shell
@@ -121,6 +122,43 @@ to nil.
     '((shell :variables shell-protect-eshell-prompt nil)))
 #+END_SRC
 
+** Fish shell and ansi-term
+Making =fish= shell to work with =ansi-term= may be a challenge, here are
+some pointers to save you time to setup your environment correctly.
+
+First be sure =~/.terminfo= is setup correctly by running:
+
+#+BEGIN_SRC fish
+tic -o ~/.terminfo $TERMINFO/e/eterm-color.ti
+#+END_SRC
+
+You can locate the =eterm-colors.ti= file with:
+
+#+BEGIN_SRC fish
+locate eterm-color.ti
+#+END_SRC
+
+Then setup your fish configuration file (usually at =~/.config/fish/config.fish=)
+
+#+BEGIN_SRC fish
+# emacs ansi-term support
+if test -n "$EMACS"
+  set -x TERM eterm-color
+end
+
+# this function may be required
+function fish_title
+  true
+end
+#+END_SRC
+
+Finally you may need to toggle truncated lines for some prompts to work
+correctly, in the function =dotspacemacs/user-config= of your dotfile add:
+
+#+BEGIN_SRC emacs-lisp
+(add-hook 'term-mode-hook 'toggle-truncate-lines)
+#+END_SRC
+
 * Eshell
 Some advanced configuration is setup for =eshell= in this layer:
 - some elisp functions aliases for quick access