diff --git a/srcpkgs/vim/files/vimrc b/srcpkgs/vim/files/vimrc
new file mode 100644
index 00000000000..c91ca46aaca
--- /dev/null
+++ b/srcpkgs/vim/files/vimrc
@@ -0,0 +1,10 @@
+" System-wide vim configuration
+
+set nocompatible
+set backspace=indent,eol,start
+set history=50
+set ruler
+
+if filereadable("/etc/vimrc.local")
+  source /etc/vimrc.local
+endif
diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index fca8a7bf3ec..15b83cc80eb 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -3,7 +3,7 @@ pkgname=vim
 _distver=7.4
 _patchver=307
 version=${_distver}.${_patchver}
-revision=1
+revision=2
 hostmakedepends="mercurial pkg-config"
 makedepends="ncurses-devel acl-devel libXt-devel gtk+-devel
   desktop-file-utils hicolor-icon-theme ruby-devel python-devel lua-devel perl"
@@ -99,6 +99,7 @@ vim-common_package() {
 	replaces="vim<=7.2_2"
 	pkg_install() {
 		vmove usr/share/vim
+		vinstall ${FILESDIR}/vimrc 644 usr/share/vim
 	}
 }