diff --git a/repos/extra-i686/PKGBUILD b/repos/extra-i686/PKGBUILD
index 079ce19a0e72b38fc5ae62154878943f99f1fc72..06e59506c1c53ac7b8edf3a743dbd83cdfd6ce00 100644
--- a/repos/extra-i686/PKGBUILD
+++ b/repos/extra-i686/PKGBUILD
@@ -3,13 +3,13 @@
 # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
 pkgname=emacs
 pkgver=23.1
-pkgrel=2
+pkgrel=3
 pkgdesc="The Emacs Editor"
 arch=(i686 x86_64)
 url="http://www.gnu.org/software/emacs/emacs.html"
 license=('GPL')
 options=(docs)
-depends=('ncurses' 'libpng' 'libtiff' 'giflib' 'libxpm' 'libjpeg>=7' 'gtk2' 'texinfo')
+depends=('dbus-core' 'librsvg' 'gpm'  'giflib' 'libtiff'  'libxpm' 'libjpeg>=7' 'gtk2' 'texinfo' 'hicolor-icon-theme')
 source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.gz emacs.desktop)
 md5sums=('a620d4452769d04ad8864d662f34f8dd' '8af038d2ba4561271e935bb444ceb4e3')
 install=emacs.install
diff --git a/repos/extra-i686/emacs.install b/repos/extra-i686/emacs.install
index ba63b29d55621c77f781476cc7d136f282a853ce..d1b4f477e29e2d5925ea2e6033f12edb15c39525 100644
--- a/repos/extra-i686/emacs.install
+++ b/repos/extra-i686/emacs.install
@@ -1,12 +1,17 @@
-info_dir=/usr/share/info
-info_files=(infoada-mode autotype calc ccmode cl dir dired-x ebrowse
-ediff efaq eintr elisp emacs emacs-mime erc eshell eudc flymake forms
-gnus idlwave info message mh-e newsticker org pcl-cvs pgg rcirc reftex
-sc ses sieve smtpmail speedbar tramp url vip viper widget woman)
+ICON_PATH=/usr/share/icons/hicolor
+INFO_DIR=/usr/share/info
+
+INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse
+ediff efaq eintr elisp emacs emacs-mime epa erc eshell eudc flymake
+forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode
+org pcl-cvs pgg rcirc reftex remember sasl sc ses sieve smtpmail
+speedbar tramp url vip viper widget woman)
 
 post_install() {
-  for f in ${info_files[@]}; do
-    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  gtk-update-icon-cache -q -t -f ${ICON_PATH}
+
+  for f in ${INFO_FILES[@]}; do
+    install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
   done
 }
 
@@ -15,8 +20,10 @@ post_upgrade() {
 }
 
 pre_remove() {
-  for f in ${info_files[@]}; do
-    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  gtk-update-icon-cache -q -t -f ${ICON_PATH}
+
+  for f in ${INFO_FILES[@]}; do
+    install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
   done
 }