diff --git a/autoload/SpaceVim/layers/lang.vim b/autoload/SpaceVim/layers/lang.vim
index 9c2b06a71..672568be9 100644
--- a/autoload/SpaceVim/layers/lang.vim
+++ b/autoload/SpaceVim/layers/lang.vim
@@ -23,6 +23,7 @@ function! SpaceVim#layers#lang#plugins() abort
                 \ ['lervag/vimtex',                          { 'on_ft' : 'tex'}],
                 \ ['vimperator/vimperator.vim',              { 'on_ft' : 'vimperator'}],
                 \ ['voxpupuli/vim-puppet',                   {'on_ft' : 'puppet'}],
+                \ ['rust-lang/rust.vim',            {'merged' : 1}],
                 \ ] 
     return plugins
 endfunction
diff --git a/autoload/SpaceVim/layers/lang/puppet.vim b/autoload/SpaceVim/layers/lang/puppet.vim
new file mode 100644
index 000000000..8a96130f6
--- /dev/null
+++ b/autoload/SpaceVim/layers/lang/puppet.vim
@@ -0,0 +1,12 @@
+function! SpaceVim#layers#lang#puppet#plugins() abort
+    let plugins = []
+    call add(plugins, ['voxpupuli/vim-puppet', { 'on_ft' : 'puppet', 'loadconf_before' : 1}])
+    return plugins
+endfunction
+
+
+function! SpaceVim#layers#lang#puppet#config() abort
+    let g:syntastic_puppet_checkers = ['puppetlint', 'puppet']
+    let g:syntastic_puppet_puppetlint_args='--no-autoloader_layout-check --no-class_inherits_from_params_class-check'
+    let g:syntastic_mode_map = { 'mode': 'active', 'passive_filetypes': ['puppet'] }
+endfunction
diff --git a/doc/SpaceVim.txt b/doc/SpaceVim.txt
index 35060950e..e61a648af 100644
--- a/doc/SpaceVim.txt
+++ b/doc/SpaceVim.txt
@@ -32,6 +32,7 @@ CONTENTS                                                   *SpaceVim-contents*
       10. lang#java.................................|SpaceVim-layer-lang-java|
       11. lang#ocaml...............................|SpaceVim-layer-lang-ocaml|
       12. lang#php...................................|SpaceVim-layer-lang-php|
+      12. lang#puppet.............................|SpaceVim-layer-lang-puppet|
       13. lang#python.............................|SpaceVim-layer-lang-python|
       14. lang#rust.................................|SpaceVim-layer-lang-rust|
       15. lang#xml...................................|SpaceVim-layer-lang-xml|
@@ -592,6 +593,18 @@ requirement:
   Composer Project
 <
 
+==============================================================================
+LANG#PUPPET                                       *SpaceVim-layer-lang-puppet*
+
+  this layer is for Puppet development, and it provides syntax highlighting,
+and syntax check.
+
+requirement:
+>
+  Puppet
+  Puppet Lint
+<
+
 ==============================================================================
 LANG#PYTHON                                       *SpaceVim-layer-lang-python*