diff --git a/emacs-auctex.spec b/emacs-auctex.spec
index 25b8c2a..c34477d 100644
--- a/emacs-auctex.spec
+++ b/emacs-auctex.spec
@@ -4,7 +4,7 @@
 Summary: 	Enhanced TeX modes for Emacsen
 Name: 		emacs-auctex
 Version: 	11.82
-Release: 	3%{?dist}
+Release: 	6%{?dist}
 License: 	GPL
 Group: 		Applications/Editors
 URL: 		http://www.gnu.org/software/auctex/
@@ -34,12 +34,12 @@ This package is for GNU Emacs.
 %setup -q -n auctex-%{version}
 
 %build
-# --with-texmf-dir overrides local docstrip configurations.
-# "--disable-preview" it would be nice to get preview added but
-#    unfortunately its Makefile is simplistic and will need some
-#    effort to get it working with rpmbuild
-%configure "--with-emacs" "--disable-preview" '--with-texmf-dir=%{_datadir}/texmf'
+mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/preview
+
+%configure --with-emacs --without-texmf-dir
+
 make
+
 pushd doc
 make auctex.info tex-ref.pdf
 popd
@@ -47,47 +47,60 @@ popd
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}{%{_datadir}/emacs/site-lisp/site-start.d,%{_infodir}}
-# mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/preview
-#makeinstall install-contrib install-info
+mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/preview
 %makeinstall
 
 mkdir -p %{buildroot}%{startupdir}
-echo "; Autoactivation of AUCTeX" > %{buildroot}%{startupfile}
-echo "; Created for %{name}-%{version}-%{release}.noarch.rpm" >> \
-  %{buildroot}%{startupfile}
-echo '(load "auctex.el" nil t t)' >> %{buildroot}%{startupfile}
 
-rm -rf %{buildroot}%{_var}
-rm -f %{buildroot}%{_datadir}/emacs/site-lisp/auctex/style/.nosearch
+cat <<EOF > %{buildroot}%{startupfile}
+;; This enables AUCTeX globally.
+;; See (info "(auctex)Introduction") on how to disable AUCTeX.
+;; Created for %{name}-%{version}-%{release}.noarch.rpm
+(load "auctex.el" nil t t)
 
-# Remove dir file that has been created by the makeinfo calls because this
-# file will not been included in the rpm distribution (make RPM 4.1+ happy)
-# rm -f '%{buildroot}%{_infodir}/dir'
+;; This enables preview-latex globally.
+;; Created for %{name}-%{version}-%{release}.noarch.rpm
+(load "preview-latex.el" nil t t)
+EOF
+
+rm -rf %{buildroot}%{_var}
+#rm -f %{buildroot}%{_datadir}/emacs/site-lisp/auctex/style/.nosearch
 
 %clean
 rm -rf %{buildroot}
 
 %post
 /sbin/install-info %{_infodir}/auctex.info %{_infodir}/dir 2>/dev/null || :
+/sbin/install-info %{_infodir}/preview-latex.info %{_infodir}/dir 2>/dev/null || :
 
 %preun
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/auctex.info %{_infodir}/dir 2>/dev/null || :
+  /sbin/install-info --delete %{_infodir}/preview-latex.info %{_infodir}/dir 2>/dev/null || :
 fi
 
 %files
 %defattr(-,root,root,-)
-%doc RELEASE COPYING INSTALL README TODO FAQ CHANGES
+%doc RELEASE COPYING README TODO FAQ CHANGES
 %doc doc/tex-ref.pdf
 %doc %{_infodir}/*.info*
 %exclude %{_infodir}/dir
 %{startupdir}
-# %{_datadir}/emacs/site-lisp/site-start.d/auctex.el
 %{_datadir}/emacs/site-lisp/auctex
-# %{startupfile}
 %{_datadir}/emacs/site-lisp/tex-site.el
 
 %changelog
+* Mon May  1 2006 Jonathan Underwood <jonathan.underwood@gmail.com> - 11.82-6
+- Leave .nosearch file in styles directory - this directory shouldn't be in the load-path
+
+* Mon May  1 2006 Jonathan Underwood <jonathan.underwood@gmail.com> - 11.82-5
+- Move installation of the preview style files out of the texmf tree for now
+
+* Mon Apr 24 2006 Jonathan Underwood <jonathan.underwood@gmail.com> - 11.82-4
+- Added preview-latex
+- Removed INSTALL document from package (not necessary)
+- Clean up generation of startup files from spec file
+
 * Thu Apr 20 2006 Ed Hill <ed@eh3.com> - 11.82-3
 - fix startup file per bug# 189488