diff --git a/docs/source/usage.rst b/docs/source/usage.rst
index 5605c891..6dca07f8 100644
--- a/docs/source/usage.rst
+++ b/docs/source/usage.rst
@@ -19,8 +19,15 @@ related Python headers to be installed. Please consult distribution’s
 documentation for details on how to compile and install packages.
 
 Vim version 7.4 or newer is recommended for performance reasons, but Powerline 
-is known to work on vim-7.0.112 (some segments may not work though as it was not 
-actually tested).
+supports Vim 7.0.112 and higher.
+
+Shell prompts requirements
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Due to fish having incorrect code for prompt width calculations up to version 
+2.1 and no way to tell that certain sequence of characters has no width 
+(``%{…%}`` in zsh and ``\[…\]`` in bash prompts serve exactly this purpose) 
+users that have fish versions below 2.1 are not supported..
 
 .. _usage-terminal-emulators:
 
diff --git a/docs/source/usage/shell-prompts.rst b/docs/source/usage/shell-prompts.rst
index f10beedd..c47d8399 100644
--- a/docs/source/usage/shell-prompts.rst
+++ b/docs/source/usage/shell-prompts.rst
@@ -65,6 +65,8 @@ the absolute path to the Powerline installation directory:
    set fish_function_path $fish_function_path "{repository_root}/powerline/bindings/fish"
    powerline-setup
 
+.. warning:: Fish is supported only starting from version 2.1.
+
 Rcsh prompt
 ===========