diff --git a/dot.gnu-emacs b/dot.gnu-emacs
index e5c2a42..ec7ac36 100644
--- a/dot.gnu-emacs
+++ b/dot.gnu-emacs
@@ -333,17 +333,20 @@
 ;;
 ;; AUC-TeX
 ;; ----------------------------
-(if (or (local-variable-p 'TeX-master)
-	(boundp 'AUCTeX-version))
+(if (boundp 'AUCTeX-version)
  (progn
-  (if  (local-variable-p 'TeX-master)
-    (setq-default TeX-master nil))
+  (let* ((version (split-string AUCTeX-version "\\."))
+	 (major (string-to-number (car version)))
+	 (minor (string-to-number (car (cdr version)))))
+    (if (or (> major 11) (and (eq major 11) (>= minor 86)))
+	(custom-set-default 'TeX-master nil)
+      (setq-default TeX-master nil)))
 ; ; Users private libaries 
 ; (if (boundp 'AUCTeX-version)
 ;   (progn
 ;     (setq TeX-macro-private '("~/lib/tex-lib/"))
 ;     (setq TeX-style-private   "~/lib/site-lisp/auctex/style/")   ; AUC-TeX-Macros
-;     (setq TeX-auto-private    "~/lib/site-lisp/auctex/auto/"))   ; Autom. Auc-TeX-Macros
+;     (setq TeX-auto-private    "~/lib/site-lisp/auctex/auto/")))  ; Autom. Auc-TeX-Macros
   (if (and window-system (featurep 'font-lock))
       (progn
 	(add-hook 'latex-mode-hook 'turn-on-font-lock)
diff --git a/emacs.changes b/emacs.changes
index d973292..52a8075 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct 13 11:38:11 CEST 2010 - werner@suse.de
+
+- Set TeX-master to nil as default
+
 -------------------------------------------------------------------
 Wed Oct  6 11:59:06 CEST 2010 - werner@suse.de
 
diff --git a/emacs.spec b/emacs.spec
index 3c1adce..e9ba6bc 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -30,7 +30,7 @@ Url:            http://www.gnu.org/software/emacs/
 License:        GPLv2+
 Group:          Productivity/Editors/Emacs
 Version:        23.1
-Release:        22
+Release:        23
 Obsoletes:      ge_exec ge_site emac_nox emacmisc emacsbin emacsger emacs-url Mule-UCS emacs-calc erc
 Requires:       emacs-info = %{version}
 Requires:       emacs_program = %{version}-%{release}