diff --git a/autoload/SpaceVim/layers/edit.vim b/autoload/SpaceVim/layers/edit.vim
index 4d6d5b554..c3b72160f 100644
--- a/autoload/SpaceVim/layers/edit.vim
+++ b/autoload/SpaceVim/layers/edit.vim
@@ -28,7 +28,6 @@ function! SpaceVim#layers#edit#plugins() abort
         \ ['easymotion/vim-easymotion'],
         \ ['haya14busa/vim-easyoperator-line'],
         \ ['editorconfig/editorconfig-vim', { 'merged' : 0}],
-        \ ['floobits/floobits-neovim',      { 'on_cmd' : ['FlooJoinWorkspace','FlooShareDirPublic','FlooShareDirPrivate']}],
         \ ['osyo-manga/vim-jplus', { 'on_map' : '<Plug>(jplus' }],
         \ ['godlygeek/tabular',           { 'on_cmd' : 'Tabularize'}],
         \ ['ntpeters/vim-better-whitespace',  { 'on_cmd' : 'StripWhitespace'}],
diff --git a/autoload/SpaceVim/layers/floobits.vim b/autoload/SpaceVim/layers/floobits.vim
new file mode 100644
index 000000000..0ede80a3c
--- /dev/null
+++ b/autoload/SpaceVim/layers/floobits.vim
@@ -0,0 +1,30 @@
+"=============================================================================
+" floobits.vim --- SpaceVim floobits layer
+" Copyright (c) 2016-2017 Wang Shidong & Contributors
+" Author: Wang Shidong < wsdjeg at 163.com >
+" URL: https://spacevim.org
+" License: GPLv3
+"=============================================================================
+
+function! SpaceVim#layers#floobits#plugins() abort
+  let plugins = [
+        \ ['floobits/floobits-neovim',      { 'on_cmd' : [
+        \ 'FlooJoinWorkspace',
+        \ 'FlooShareDirPublic',
+        \ 'FlooShareDirPrivate'
+        \ ]}],
+        \ ]
+  return plugins
+endfunction 
+
+
+function! SpaceVim#layers#floobits#config() abort
+  let g:_spacevim_mappings_space.m.f = {'name' : '+floobits'}
+  call SpaceVim#mapping#space#def('nnoremap', ['m', 'f', 'j'], 'FlooJoinWorkspace',
+        \ 'Join workspace', 1)
+  call SpaceVim#mapping#space#def('nnoremap', ['m', 'f', 't'], 'FlooToggleFollowMode',
+        \ 'Toggle follow mode', 1)
+  call SpaceVim#mapping#space#def('nnoremap', ['m', 'f', 's'], 'FlooSummon',
+        \ 'Summon everyone', 1)
+endfunction
+
diff --git a/docs/layers/floobits.md b/docs/layers/floobits.md
new file mode 100644
index 000000000..13ccac15e
--- /dev/null
+++ b/docs/layers/floobits.md
@@ -0,0 +1,45 @@
+---
+title: "SpaceVim floobits layer"
+description: "This layer adds support for the peer programming tool floobits to SpaceVim."
+---
+
+# [SpaceVim Layers:](https://spacevim.org/layers) floobits
+
+<!-- vim-markdown-toc GFM -->
+
+- [Intro](#intro)
+- [Features](#features)
+- [Install](#install)
+- [Key bindings](#key-bindings)
+
+<!-- vim-markdown-toc -->
+
+## Intro
+
+This layer adds support for the peer programming tool floobits to SpaceVim.
+
+NOTE: This layer only support neovim.
+
+## Features
+
+- Adjust floobits configuration file in the root of a project.
+- Creation of floobits workspaces and populating it with content.
+- Highlight cursor position for all users in current workspace.
+- Follow recent changes by other users
+
+## Install
+
+To use this configuration layer, add following snippet to your custom configuration file.
+
+```toml
+[[layers]]
+name = "floobits"
+```
+
+## Key bindings
+
+| Key bindings | Discription                                               |
+| ------------ | --------------------------------------------------------- |
+| `SPC m f j`  | Join workspace                                            |
+| `SPC m f t`  | Toggle follow mode                                        |
+| `SPC m f s`  | Summon everyone in the workspace to your cursor position. |