diff --git a/PKGBUILD b/PKGBUILD
index fe49b5a..19bd823 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname="bbdb"
 pkgver=2.35
-pkgrel=2
+pkgrel=3
 pkgdesc="A rolodex-like database for Emacs"
 arch=('i686' 'x86_64')
 url="http://bbdb.sourceforge.net"
@@ -15,12 +15,23 @@ source=("http://bbdb.sourceforge.net/$pkgname-$pkgver.tar.gz")
 md5sums=('5c4e7f2b2a6a8e25ff77351f533f3910')
 
 build() {
-  cd "$startdir/src/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
   ./configure --prefix=/usr || return 1
-  make || return 1
-  mkdir -p $startdir/pkg/usr/share/emacs/site-lisp/bbdb
-  cp lisp/*.el{,c} $startdir/pkg/usr/share/emacs/site-lisp/bbdb
+  make all || return 1
+
+  emacsdir="$pkgdir/usr/share/emacs/site-lisp/bbdb"
+  mkdir -p "$emacsdir"
+  cp lisp/*.el lisp/*.elc "$emacsdir"
+
+  texdir="$pkgdir/usr/share/texmf-dist/tex/plain/bbdb"
+  mkdir -p "$texdir"
+  cp tex/*.tex "$texdir"
+                          
+  infodir="$pkgdir/usr/share/info"
+  mkdir -p "$infodir"
+  cp texinfo/bbdb.info "$infodir"
+  gzip "$infodir/bbdb.info"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/bbdb.install b/bbdb.install
index f5dfb75..8e314af 100644
--- a/bbdb.install
+++ b/bbdb.install
@@ -1,3 +1,5 @@
+infodir=/usr/share/info
+
 post_install() {
   echo ">> To enable BBDB add this to your .emacs:"
   echo ">>    (require 'bbdb)"
@@ -6,6 +8,17 @@ post_install() {
   echo ">>    (require 'bbdb)"
   echo ">>    (bbdb-initialize 'gnus 'message)"
   echo ">>    (bbdb-insinuate-gnus)"
+  [ -x usr/bin/install-info ] || return 0
+  install-info "$infodir/bbdb.info.gz" "$infodir/dir"
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  install-info --delete "$infodir/bbdb.info.gz" "$infodir/dir"
 }
 
 # vim:set ts=2 sw=2 et: