diff --git a/emacs-auctex.changes b/emacs-auctex.changes
index 6596d0d..832e89e 100644
--- a/emacs-auctex.changes
+++ b/emacs-auctex.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jul 23 10:04:12 UTC 2012 - werner@suse.de
+
+- Use texlive-texinfo for build and add also all LaTeX styles to
+  be scanned during AucTeX build.
+- Use texinfo *and* makeinfo for build as both are required
+
 -------------------------------------------------------------------
 Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de
 
diff --git a/emacs-auctex.spec b/emacs-auctex.spec
index 9865a09..4409701 100644
--- a/emacs-auctex.spec
+++ b/emacs-auctex.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package emacs-auctex
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,17 +16,35 @@
 #
 
 
-
 Name:           emacs-auctex
-BuildRequires:  emacs-x11 ghostscript_any giflib-devel libpng-devel libtiff-devel texlive texlive-latex xorg-x11 xorg-x11-devel
+BuildRequires:  emacs-x11
+BuildRequires:  ghostscript_any
+BuildRequires:  giflib-devel
+BuildRequires:  libpng-devel
+BuildRequires:  libtiff-devel
+BuildRequires:  texlive
+BuildRequires:  texlive-latex
+BuildRequires:  xorg-x11
+BuildRequires:  xorg-x11-devel
+Obsoletes:      ge_auc
+Provides:       auc-tex
+Provides:       auctex
+Provides:       ge_auc
+Requires:       emacs
+Requires:       texlive-latex
+Requires:       texlive-tools
+%if %suse_version > 1220
+BuildRequires:  makeinfo
+BuildRequires:  texinfo
+BuildRequires:  texlive-collection-latexextra
+BuildRequires:  texlive-tex
+BuildRequires:  texlive-texinfo
+%endif
+Version:        11.86
+Release:        0
+Summary:        AUC TeX: An Emacs Extension
 License:        GPL-2.0+
 Group:          Productivity/Editors/Emacs
-Obsoletes:      ge_auc
-Provides:       auc-tex auctex ge_auc
-Requires:       emacs texlive-tools texlive-latex
-Version:        11.86
-Release:        4
-Summary:        AUC TeX: An Emacs Extension
 Source:         ftp://ftp.gnu.org/pub/gnu/auctex/auctex-%{version}.tar.bz2
 Url:            http://www.gnu.org/software/auctex
 Patch:          auctex-11.86.dif