diff --git a/PKGBUILD.orig b/PKGBUILD
index eb5b753..5011116 100644
--- a/PKGBUILD.orig
+++ b/PKGBUILD
@@ -3,13 +3,13 @@
 
 pkgname=git
 pkgver=1.8.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64)
 url="http://git-scm.com/"
 license=('GPL2')
 depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre')
-makedepends=('python2' 'emacs')
+makedepends=('python2' 'emacs' 'libgnome-keyring')
 optdepends=('tk: gitk and git gui'
             'perl-libwww: git svn'
             'perl-term-readkey: git svn'
@@ -18,7 +18,8 @@ optdepends=('tk: gitk and git gui'
             'perl-authen-sasl: git send-email TLS support'
             'python2: various helper scripts'
             'subversion: git svn'
-            'cvsps: git cvsimport')
+            'cvsps: git cvsimport'
+            'gnome-keyring: GNOME keyring credential helper')
 replaces=('git-core')
 provides=('git-core')
 backup=('etc/conf.d/git-daemon.conf')
@@ -37,8 +38,9 @@ build() {
     NO_CROSS_DIRECTORY_HARDLINKS=1 \
     all
 
-  cd contrib/emacs
-  make prefix=/usr
+  make -C contrib/emacs prefix=/usr
+
+  make -C contrib/credential/gnome-keyring
 }
 
 check() {
@@ -68,16 +70,16 @@ package() {
     CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
     USE_LIBPCRE=1 \
     NO_CROSS_DIRECTORY_HARDLINKS=1 \
-    INSTALLDIRS=vendor DESTDIR="$pkgdir" install 
+    INSTALLDIRS=vendor DESTDIR="$pkgdir" install
 
   # bash completion
   mkdir -p "$pkgdir"/usr/share/bash-completion/completions/
-  install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git 
+  install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git
   # fancy git prompt
   mkdir -p "$pkgdir"/usr/share/git/
   install -m644 ./contrib/completion/git-prompt.sh "$pkgdir"/usr/share/git/git-prompt.sh
   # more contrib stuff
-  cp -a ./contrib/* $pkgdir/usr/share/git/ 
+  cp -a ./contrib/* $pkgdir/usr/share/git/
   # scripts are for python 2.x
   sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \
     $(find "$pkgdir" -name '*.py') \
@@ -89,8 +91,11 @@ package() {
     "$pkgdir"/usr/share/git/svn-fe/svnrdump_sim.py
 
   # emacs interface
-  cd contrib/emacs
-  make prefix=/usr DESTDIR="$pkgdir" install
+  make -C contrib/emacs prefix=/usr DESTDIR="$pkgdir" install
+
+  # gnome-keyring credential helper
+  install -m 755 contrib/credential/gnome-keyring/git-credential-gnome-keyring "$pkgdir"/usr/lib/git-core/git-credential-gnome-keyring
+  rm -rf "$pkgdir"/usr/share/git/credential/gnome-keyring
 
   # how 'bout some manpages?
   for mansect in man1 man5 man7; do