diff -Nru auctex-11.87/debian/changelog auctex-11.87/debian/changelog
--- auctex-11.87/debian/changelog	2014-11-09 14:28:18.000000000 +0100
+++ auctex-11.87/debian/changelog	2014-11-18 17:11:53.000000000 +0100
@@ -1,3 +1,10 @@
+auctex (11.87-4) testing; urgency=medium
+
+  * [eeac127] Add upstream patch: Call `make-local-hook' only on XEmacs.
+    Thanks to Martin Schwenke (Closes: #769977)
+
+ -- Davide G. M. Salvetti <salve@debian.org>  Tue, 18 Nov 2014 17:11:53 +0100
+
 auctex (11.87-3) testing; urgency=medium
 
   * [59fd7bc] Drop emacs23 dependencies, keep emacs24 to the front.
diff -Nru auctex-11.87/debian/patches/0007-Call-make-local-hook-only-on-XEmacs.patch auctex-11.87/debian/patches/0007-Call-make-local-hook-only-on-XEmacs.patch
--- auctex-11.87/debian/patches/0007-Call-make-local-hook-only-on-XEmacs.patch	1970-01-01 01:00:00.000000000 +0100
+++ auctex-11.87/debian/patches/0007-Call-make-local-hook-only-on-XEmacs.patch	2014-11-18 17:10:43.000000000 +0100
@@ -0,0 +1,37 @@
+From: "Davide G. M. Salvetti" <salve@debian.org>
+Date: Tue, 18 Nov 2014 17:09:02 +0100
+Subject: Call `make-local-hook' only on XEmacs
+
+* Upstream patch [9e0fae3].
+---
+ ChangeLog   | 5 +++++
+ bib-cite.el | 3 ++-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index c1e5960..343fe76 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2013-09-02  Tassilo Horn  <tsdh@gnu.org>
++
++	* bib-cite.el (bib-cite-minor-mode): Call `make-local-hook' only
++	on XEmacs.
++
+ 2012-11-30  Ralf Angeli <angeli@caeruleus.net>
+ 
+ 	* Version 11.87 released.
+diff --git a/bib-cite.el b/bib-cite.el
+index afd7aa2..0e77de9 100644
+--- a/bib-cite.el
++++ b/bib-cite.el
+@@ -763,7 +763,8 @@ runs bib-find, and [mouse-3] runs bib-display."
+ 	(progn
+ 	  (bib-cite-setup-highlight-mouse-keymap)
+ 	  (bib-highlight-mouse)
+-	  (make-local-hook 'after-change-functions)
++	  (when bib-cite-is-XEmacs
++	    (make-local-hook 'after-change-functions))
+ 	  (add-hook 'after-change-functions
+ 		    'bib-cite-setup-mouse-function nil t)))
+     (if bib-cite-is-XEmacs
diff -Nru auctex-11.87/debian/patches/series auctex-11.87/debian/patches/series
--- auctex-11.87/debian/patches/series	2014-11-09 14:28:41.000000000 +0100
+++ auctex-11.87/debian/patches/series	2014-11-18 17:10:43.000000000 +0100
@@ -4,3 +4,4 @@
 0004-TeX-view-program-selection-Customize-for-Debian.patch
 0005-TeX-auto-global-Customize-for-Debian.patch
 0006-preview-image-type-Customize-for-Debian.patch
+0007-Call-make-local-hook-only-on-XEmacs.patch