diff --git a/lyx.changes b/lyx.changes
index 28448ae..112460b 100644
--- a/lyx.changes
+++ b/lyx.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct  9 19:16:54 CEST 2008 - werner@suse.de
+
+- Correct path for texmf
+
 -------------------------------------------------------------------
 Thu Oct  2 11:17:48 CEST 2008 - stbinner@suse.de
 
diff --git a/lyx.spec b/lyx.spec
index 32165a6..c576f25 100644
--- a/lyx.spec
+++ b/lyx.spec
@@ -31,7 +31,7 @@ Group:          Productivity/Publishing/TeX/Frontends
 Requires:       texlive-latex ImageMagick free-ttf-fonts
 AutoReqProv:    on
 Version:        1.6rc3
-Release:        1
+Release:        2
 %define rversion 1.6.0rc3
 Summary:        LaTeX-Based WYSIWYG Editor
 Url:            http://www.lyx.org/
@@ -63,9 +63,18 @@ export CFLAGS="$RPM_OPT_FLAGS -DHAVE_STRERROR -fno-inline"
 export CXXFLAGS="$RPM_OPT_FLAGS -DHAVE_STRERROR -fno-inline"
 export QTDIR=/usr/lib/qt3/
 export PATH=$QTDIR/bin:$PATH
+TEXMF=%{_datadir}/texmf
+%if %suse_version > 1020
+TEXMF=$(kpsexpand '$TEXMFMAIN')
+%if %suse_version > 1030
+TEXMF=$(kpsexpand '$TEXMFDIST')
+%endif
+%endif
 %configure \
-    --with-texmf=/usr/lib/teTeX/texmf \
+    --with-texmf=$TEXMF \
+%if %suse_version < 1020
     --with-extra-inc=/usr/X11R6/include/X11 \
+%endif
     --with-aspell \
     --with-frontend=qt4 \
     --with-qt-dir=$QTDIR \
@@ -74,20 +83,27 @@ export PATH=$QTDIR/bin:$PATH
 make %{?jobs:-j%jobs}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT TEXMF=/usr/lib/teTeX/texmf
+TEXMF=%{_datadir}/texmf
+%if %suse_version > 1020
+TEXMF=$(kpsexpand '$TEXMFMAIN')
+%if %suse_version > 1030
+TEXMF=$(kpsexpand '$TEXMFDIST')
+%endif
+%endif
+make install DESTDIR=$RPM_BUILD_ROOT TEXMF=$TEXMF
 mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
-pushd $RPM_BUILD_ROOT/usr/share/lyx/doc/
+pushd $RPM_BUILD_ROOT%{_datadir}/lyx/doc/
     for i in *
     do
-        ln -s /usr/share/lyx/doc/$i \
+        ln -s %{_datadir}/lyx/doc/$i \
 	      $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/
     done
 popd
 cp ABOUT-NLS ANNOUNCE COPYING INSTALL* NEWS \
    README README.localization RELEASE-NOTES UPGRADING \
    $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/
-mkdir -p $RPM_BUILD_ROOT/usr/share/texmf/tex/latex
-ln -s /usr/share/lyx/tex $RPM_BUILD_ROOT/usr/share/texmf/tex/latex/lyx
+mkdir -p $RPM_BUILD_ROOT$TEXMF/tex/latex
+ln -s %{_datadir}/lyx/tex $RPM_BUILD_ROOT$TEXMF/tex/latex/lyx
 %suse_update_desktop_file -i lyx Office WordProcessor
 %fdupes -s $RPM_BUILD_ROOT
 %find_lang %name
@@ -97,20 +113,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %name.lang
 %defattr(-,root,root)
-%docdir /usr/share/lyx/doc
+%docdir %{_datadir}/lyx/doc
 %doc %{_defaultdocdir}/lyx
 /usr/bin/lyx
 /usr/bin/lyxclient
 /usr/bin/tex2lyx
-/usr/share/applications/lyx.desktop
-/usr/share/pixmaps/lyx.png
-/usr/share/texmf/tex/latex/lyx
-/usr/share/lyx
+%{_datadir}/applications/lyx.desktop
+%{_datadir}/pixmaps/lyx.png
+%{_datadir}/texmf/tex/latex/lyx
+%{_datadir}/lyx
 %doc %{_mandir}/man1/lyx.1.gz
 %doc %{_mandir}/man1/lyxclient.1.gz
 %doc %{_mandir}/man1/tex2lyx.1.gz
 
 %changelog
+* Thu Oct 09 2008 werner@suse.de
+- Correct path for texmf
 * Thu Oct 02 2008 stbinner@suse.de
 - update to 1.6 release candidate 3: bugfixes
 * Fri Sep 19 2008 stbinner@suse.de