diff --git a/repos/extra-i686/PKGBUILD b/repos/extra-i686/PKGBUILD
index f573849e0554912ab9071bf381fbda099903f751..6c8118102f60a0f1d98ec389f6fc2cf3ac64a570 100644
--- a/repos/extra-i686/PKGBUILD
+++ b/repos/extra-i686/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=emacs
 pkgver=24.2
-pkgrel=2
+pkgrel=3
 pkgdesc="The extensible, customizable, self-documenting real-time display editor"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/emacs/emacs.html"
@@ -29,10 +29,8 @@ package() {
   # remove conflict with ctags package
   mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
   mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
-  # fix all the 777 perms on directories
-  find "$pkgdir"/usr/share/emacs/$_majorver -type d -exec chmod 755 {} \;
   # fix user/root permissions on usr/share files
-  find "$pkgdir"/usr/share/emacs/$_majorver -exec chown root:root {} \;
+  find "$pkgdir"/usr/share/emacs/$pkgver -exec chown root:root {} \;
   # fix perms on /var/games
   chmod 775 "$pkgdir"/var/games
   chmod 775 "$pkgdir"/var/games/emacs
diff --git a/repos/extra-i686/emacs.install b/repos/extra-i686/emacs.install
index d84f1de14449708b554ef54360a5c2fa788eaa7a..fa9ffeeb1c4988b105999a668a278ea196bec858 100644
--- a/repos/extra-i686/emacs.install
+++ b/repos/extra-i686/emacs.install
@@ -2,7 +2,7 @@ ICON_PATH=usr/share/icons/hicolor
 INFO_DIR=usr/share/info
 
 INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse
-ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc eshell eudc flymake
+ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc ert eshell eudc flymake
 forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode
 org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail
 speedbar tramp url vip viper widget woman)
diff --git a/repos/extra-x86_64/PKGBUILD b/repos/extra-x86_64/PKGBUILD
index f573849e0554912ab9071bf381fbda099903f751..6c8118102f60a0f1d98ec389f6fc2cf3ac64a570 100644
--- a/repos/extra-x86_64/PKGBUILD
+++ b/repos/extra-x86_64/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=emacs
 pkgver=24.2
-pkgrel=2
+pkgrel=3
 pkgdesc="The extensible, customizable, self-documenting real-time display editor"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/emacs/emacs.html"
@@ -29,10 +29,8 @@ package() {
   # remove conflict with ctags package
   mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
   mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
-  # fix all the 777 perms on directories
-  find "$pkgdir"/usr/share/emacs/$_majorver -type d -exec chmod 755 {} \;
   # fix user/root permissions on usr/share files
-  find "$pkgdir"/usr/share/emacs/$_majorver -exec chown root:root {} \;
+  find "$pkgdir"/usr/share/emacs/$pkgver -exec chown root:root {} \;
   # fix perms on /var/games
   chmod 775 "$pkgdir"/var/games
   chmod 775 "$pkgdir"/var/games/emacs
diff --git a/repos/extra-x86_64/emacs.install b/repos/extra-x86_64/emacs.install
index d84f1de14449708b554ef54360a5c2fa788eaa7a..fa9ffeeb1c4988b105999a668a278ea196bec858 100644
--- a/repos/extra-x86_64/emacs.install
+++ b/repos/extra-x86_64/emacs.install
@@ -2,7 +2,7 @@ ICON_PATH=usr/share/icons/hicolor
 INFO_DIR=usr/share/info
 
 INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse
-ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc eshell eudc flymake
+ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc ert eshell eudc flymake
 forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode
 org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail
 speedbar tramp url vip viper widget woman)