diff --git a/guix/build-system/vim.scm b/guix/build-system/vim.scm
index 6c074fd60..adc0a9fdd 100644
--- a/guix/build-system/vim.scm
+++ b/guix/build-system/vim.scm
@@ -35,7 +35,7 @@
 ;; Code:
 
 (define %vim-build-system-modules
-  ;; Build-side moduels imported by default.
+  ;; Build-side modules imported by default.
   `((guix build vim-build-system)
     ,@%gnu-build-system-modules))
 
diff --git a/guix/build/vim-build-system.scm b/guix/build/vim-build-system.scm
index 5c55f1256..d97d44cf9 100644
--- a/guix/build/vim-build-system.scm
+++ b/guix/build/vim-build-system.scm
@@ -49,33 +49,37 @@ archive, a directory or a '.vim' file."
   (let* ((out (assoc-ref outputs "out"))
          (source (getcwd))
          (vimfiles (string-append out "/share/vim/vimfiles")))
-    (when (file-exists? "autoload")
-      (copy-recursively "autoload"
-                        (string-append vimfiles "/autoload")))
-    (when (file-exists? "afer")
-      (copy-recursively "after"
-                        (string-append vimfiles "/after")))
-    (when (file-exists? "doc")
-      (copy-recursively "doc"
-                        (string-append vimfiles "/doc")))
-    (when (file-exists? "ftdetect")
-      (copy-recursively "ftdetect"
-                        (string-append vimfiles "/ftdetect")))
-    (when (file-exists? "ftplugin")
-      (copy-recursively "ftplugin"
-                        (string-append vimfiles "/ftplugin")))
-    (when (file-exists? "indent")
-      (copy-recursively "indent"
-                        (string-append vimfiles "/indent")))
-    (when (file-exists? "plugin")
-      (copy-recursively "plugin"
-                        (string-append vimfiles "/plugin")))
-    (when (file-exists? "rplugin")
-      (copy-recursively "rplugin"
-                        (string-append vimfiles "/rplugin")))
-    (when (file-exists? "syntax")
-      (copy-recursively "syntax"
-                        (string-append vimfiles "/syntax")))
+    (lambda (dir)
+      (when (file-exists? dir)
+        (copy-recursively dir (string-append vimfiles "/" dir))))
+    (list "autoload" "after" "doc" "ftdetect" "ftplugin" "indent" "plugin" "rplugin" "syntax")
+    ;(when (file-exists? "autoload")
+    ;  (copy-recursively "autoload"
+    ;                    (string-append vimfiles "/autoload")))
+    ;(when (file-exists? "after")
+    ;  (copy-recursively "after"
+    ;                    (string-append vimfiles "/after")))
+    ;(when (file-exists? "doc")
+    ;  (copy-recursively "doc"
+    ;                    (string-append vimfiles "/doc")))
+    ;(when (file-exists? "ftdetect")
+    ;  (copy-recursively "ftdetect"
+    ;                    (string-append vimfiles "/ftdetect")))
+    ;(when (file-exists? "ftplugin")
+    ;  (copy-recursively "ftplugin"
+    ;                    (string-append vimfiles "/ftplugin")))
+    ;(when (file-exists? "indent")
+    ;  (copy-recursively "indent"
+    ;                    (string-append vimfiles "/indent")))
+    ;(when (file-exists? "plugin")
+    ;  (copy-recursively "plugin"
+    ;                    (string-append vimfiles "/plugin")))
+    ;(when (file-exists? "rplugin")
+    ;  (copy-recursively "rplugin"
+    ;                    (string-append vimfiles "/rplugin")))
+    ;(when (file-exists? "syntax")
+    ;  (copy-recursively "syntax"
+    ;                    (string-append vimfiles "/syntax")))
     #t))
 
 (define %standard-phases