diff -Naur a/PKGBUILD b/PKGBUILD
--- a/PKGBUILD	2011-02-01 07:50:19.000000000 +0100
+++ b/PKGBUILD	2011-10-12 16:55:30.607849339 +0200
@@ -16,10 +16,10 @@
          'efbd5986e691ce8c876fb86e8f5961ea')
 
 build() {
-    install -d ${pkgdir}/usr/share/vim/{autoload,doc,plugin}
-    install -Dm755 ${srcdir}/doc/* ${pkgdir}/usr/share/vim/doc/ || return 1
-    install -Dm755 ${srcdir}/plugin/* ${pkgdir}/usr/share/vim/plugin/ || return 1
-    install -Dm755 ${srcdir}/autoload/* ${pkgdir}/usr/share/vim/autoload/ || return 1
+    install -d ${pkgdir}/usr/share/vim/vimfiles/{autoload,doc,plugin}
+    install -Dm755 ${srcdir}/doc/* ${pkgdir}/usr/share/vim/vimfiles/doc/ || return 1
+    install -Dm755 ${srcdir}/plugin/* ${pkgdir}/usr/share/vim/vimfiles/plugin/ || return 1
+    install -Dm755 ${srcdir}/autoload/* ${pkgdir}/usr/share/vim/vimfiles/autoload/ || return 1
     install -Dm755 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt
 }
 
diff -Naur a/vimdoc.install b/vimdoc.install
--- a/vimdoc.install	2011-02-01 07:48:05.000000000 +0100
+++ b/vimdoc.install	2011-10-12 16:54:34.404820485 +0200
@@ -1,7 +1,7 @@
 post_install() {
     echo -n "Updating vim help tags..."
     /usr/bin/vim --noplugins -u NONE -U NONE \
-        --cmd ":helptags /usr/share/vim/doc" --cmd ":q" > /dev/null 2>&1
+        --cmd ":helptags /usr/share/vim/vimfiles/doc" --cmd ":q" > /dev/null 2>&1
     echo "done."
 }