diff --git a/autoload/SpaceVim/layers/format.vim b/autoload/SpaceVim/layers/format.vim
index ec13a4bb9..790b8cc34 100644
--- a/autoload/SpaceVim/layers/format.vim
+++ b/autoload/SpaceVim/layers/format.vim
@@ -22,7 +22,7 @@
 
 function! SpaceVim#layers#format#plugins() abort
     return [
-                \ ['sbdchd/neoformat', {'merged' : 0, 'loadconf' : 1 , 'loadconf_before' : 1}],
+                \ ['neoformat/neoformat', {'merged' : 0, 'loadconf' : 1 , 'loadconf_before' : 1}],
                 \ ]
 endfunction
 
diff --git a/autoload/SpaceVim/layers/lang/python.vim b/autoload/SpaceVim/layers/lang/python.vim
index 2894f1420..86f0d54f0 100644
--- a/autoload/SpaceVim/layers/lang/python.vim
+++ b/autoload/SpaceVim/layers/lang/python.vim
@@ -50,12 +50,6 @@ function! SpaceVim#layers#lang#python#config() abort
 
   " }}}
 
-  let g:neoformat_python_autoflake = {
-        \ 'exe': 'autoflake',
-        \ 'args': ['--in-place', '--remove-duplicate-keys', '--expand-star-imports'],
-        \ 'stdin': 0,
-        \ }
-
   call SpaceVim#plugins#runner#reg_runner('python', 
         \ {
         \ 'exe' : function('s:getexe'),
diff --git a/wiki/cn/Following-HEAD.md b/wiki/cn/Following-HEAD.md
index d9ee1e80b..1ba56b43d 100644
--- a/wiki/cn/Following-HEAD.md
+++ b/wiki/cn/Following-HEAD.md
@@ -26,6 +26,7 @@
 
 - Do not load language layer ([#2220](https://github.com/SpaceVim/SpaceVim/pull/2220))
 - Changed the behavior of 2-LeftMouse in vimfiler ([#2221](https://github.com/SpaceVim/SpaceVim/pull/2221)) 
+- Use forked neoformat repo ([#2360](https://github.com/SpaceVim/SpaceVim/pull/2360), [#2355](https://github.com/SpaceVim/SpaceVim/pull/2355))
 
 ### 问题修复
 
diff --git a/wiki/en/Following-HEAD.md b/wiki/en/Following-HEAD.md
index f3fd31d75..f318d515c 100644
--- a/wiki/en/Following-HEAD.md
+++ b/wiki/en/Following-HEAD.md
@@ -26,6 +26,7 @@ The next release is v1.0.0.
 
 - Do not load language layer ([#2220](https://github.com/SpaceVim/SpaceVim/pull/2220))
 - Changed the behavior of 2-LeftMouse in vimfiler ([#2221](https://github.com/SpaceVim/SpaceVim/pull/2221)) 
+- Use forked neoformat repo ([#2360](https://github.com/SpaceVim/SpaceVim/pull/2360), [#2355](https://github.com/SpaceVim/SpaceVim/pull/2355))
 
 ### Fixed