diff --git a/.gitignore b/.gitignore
index 5a97ac0..1f2a672 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-/hevea-2.09.tar.gz
+/hevea-2.12.tar.gz
+/hevea-2.12-manual.pdf
diff --git a/hevea.spec b/hevea.spec
index 7b97d15..269cf6b 100644
--- a/hevea.spec
+++ b/hevea.spec
@@ -1,13 +1,15 @@
 %global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
+%global _texmf %{_datadir}/texmf
 
 Name:		hevea
-Version:	2.09
-Release:	2%{?dist}
+Version:	2.12
+Release:	1%{?dist}
 Summary:	LaTeX to HTML translator
 Group:		Applications/Publishing
 License:	QPL
 URL:		http://hevea.inria.fr/
 Source0:	http://hevea.inria.fr/distri/%{name}-%{version}.tar.gz
+Source1:	http://hevea.inria.fr/distri/%{name}-%{version}-manual.pdf
 BuildRequires:	ocaml >= 3.12, tex(latex)
 Requires:	tex(latex) netpbm-progs ghostscript tex(dvips)
 Requires(post):	kpathsea
@@ -23,6 +25,7 @@ modern browsers display correctly most of the time.
 
 %prep
 %setup -q
+cp -p %{SOURCE1} .
 
 
 %build
@@ -32,7 +35,7 @@ make %{?_smp_mflags} \
 %endif
 	PREFIX=%{_prefix} \
 	LIBDIR=%{_datadir}/%{name} \
-	LATEXLIBDIR=%{_texmf_main}/tex/latex/hevea \
+	LATEXLIBDIR=%{_texmf}/tex/latex/hevea \
 	OCAMLFLAGS="-g -w +a-4-9"
 
 
@@ -44,23 +47,27 @@ make install \
 	DESTDIR=%{buildroot}
 	PREFIX=%{_prefix} \
 	LIBDIR=%{_datadir}/hevea \
-	LATEXLIBDIR=%{_texmf_main}/tex/latex/hevea
+	LATEXLIBDIR=%{_texmf}/tex/latex/hevea
 
 	
-%post -p /usr/bin/texhash
+%post -p /usr/bin/mktexlsr
 
 
-%postun -p /usr/bin/texhash
+%postun -p /usr/bin/mktexlsr
 
 
 %files
-%doc README CHANGES LICENSE
+%doc README CHANGES LICENSE %{name}-%{version}-manual.pdf
 %{_bindir}/*
 %{_datadir}/hevea
-%{_texmf_main}/tex/latex/hevea/
+%{_texmf}/tex/latex/hevea/
 
 
 %changelog
+* Thu Jan 16 2014 Jerry James <loganjerry@gmail.com> - 2.12-1
+- New upstream release
+- Work around broken texlive _texmf_main macro (bz 1054317)
+
 * Mon Sep 16 2013 Jerry James <loganjerry@gmail.com> - 2.09-2
 - Fix typo in Requires(postun)
 
diff --git a/sources b/sources
index c81d5f7..22240ad 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-8a61c7a81433e036d2ea57600f69adf7  hevea-2.09.tar.gz
+8330f7c1c1615242b13a894737ca5992  hevea-2.12.tar.gz
+3edbfe95f7d12ea386a0ef1d3d4fd667  hevea-2.12-manual.pdf