diff --git a/PKGBUILD b/PKGBUILD
index 0a6af20..7cf5a39 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=git
 pkgver=1.6.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64)
 url="http://git-scm.com/"
@@ -30,8 +30,30 @@ build() {
   mkdir -p $pkgdir/etc/bash_completion.d/
   install -m644 ./contrib/completion/git-completion.bash $pkgdir/etc/bash_completion.d/git || return 1
 
+  # Emacs
+  (
+      set -e
+      cd contrib/emacs
+      destdir=$pkgdir/usr/share/emacs/site-lisp/git
+      mkdir -p $destdir
+      for f in *; do
+          [ $f = Makefile ] && continue
+          install -m644 $f $destdir || return 1
+      done
+  )
+  [ $? -eq 0 ] || return 1
+
   # more contrib stuff
-  cp -a ./contrib $pkgdir/usr/share/git/ || return 1
+  (
+      set -e
+      cd contrib
+      mkdir -p $pkgdir/usr/share/git
+      for f in *; do
+          [ $f = emacs -o $f = completion ] && continue
+          cp -RP $f $pkgdir/usr/share/git/ || return 1
+      done
+  )
+  [ $? -eq 0 ] || return 1
 
   # how 'bout some manpages?
   for mansect in man1 man5 man7; do