diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 6c9f8d665e1..5e6e73419d2 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -343,6 +343,17 @@ rec {
 
   };
 
+  vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-autoformat-2016-02-24";
+    src = fetchgit {
+      url = "git://github.com/Chiel92/vim-autoformat";
+      rev = "a2f9b88bcd66fe47a44ae8b5e1002c2d8e6f4ad4";
+      sha256 = "1fahm3dzcmpr7f9rrhzhyrj6fz95fblxal57gajcc3g136bizbnj";
+    };
+    dependencies = [];
+
+  };
+
   vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-css-color-2015-10-03";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 2feb3049c6f..87420a7a4ca 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -1,7 +1,6 @@
 "CSApprox"
 "CheckAttach"
 "Gist"
-"github:sjl/gundo.vim"
 "Hoogle"
 "Solarized"
 "Supertab"
@@ -20,6 +19,8 @@
 "extradite"
 "fugitive"
 "ghcmod"
+"github:Chiel92/vim-autoformat"
+"github:LnL7/vim-nix"
 "github:ap/vim-css-color"
 "github:benekastah/neomake"
 "github:bitc/vim-hdevtools"
@@ -46,7 +47,6 @@
 "github:latex-box-team/latex-box"
 "github:lepture/vim-jinja"
 "github:lervag/vimtex"
-"github:LnL7/vim-nix"
 "github:lokaltog/vim-easymotion"
 "github:lyokha/vim-xkbswitch"
 "github:mhinz/vim-startify"
@@ -61,10 +61,11 @@
 "github:shougo/unite.vim"
 "github:shougo/vimproc.vim"
 "github:shougo/vimshell.vim"
+"github:sjl/gundo.vim"
 "github:takac/vim-hardtime"
 "github:thinca/vim-quickrun"
-"github:tpope/vim-eunuch"
 "github:tomasr/molokai"
+"github:tpope/vim-eunuch"
 "github:travitch/hasksyn"
 "github:twinside/vim-haskellconceal"
 "github:valloric/youcompleteme"