diff --git a/dot.gnu-emacs b/dot.gnu-emacs
index ec7ac36..e5c2a42 100644
--- a/dot.gnu-emacs
+++ b/dot.gnu-emacs
@@ -333,20 +333,17 @@
 ;;
 ;; AUC-TeX
 ;; ----------------------------
-(if (boundp 'AUCTeX-version)
+(if (or (local-variable-p 'TeX-master)
+	(boundp 'AUCTeX-version))
  (progn
-  (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)))
+  (if  (local-variable-p 'TeX-master)
+    (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 52a8075..d973292 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-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