diff --git a/libvdpau.spec b/libvdpau.spec
index 80362f5..99ddd53 100644
--- a/libvdpau.spec
+++ b/libvdpau.spec
@@ -1,94 +1,90 @@
 Name:           libvdpau
 Version:        0.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Wrapper library for the Video Decode and Presentation API
-
-Group:          System Environment/Libraries
 License:        MIT
 URL:            http://freedesktop.org/wiki/Software/VDPAU
-Source0:        http://cgit.freedesktop.org/~aplattner/libvdpau/snapshot/libvdpau-%{version}.tar.gz
-
-BuildRequires:  libtool
+Source0:        http://cgit.freedesktop.org/~aplattner/%{name}/snapshot/%{name}-%{version}.tar.gz
 
-%{?!_without_docs:
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  doxygen
 BuildRequires:  graphviz
-BuildRequires:  texlive-latex
-}
-
+BuildRequires:  libtool
 BuildRequires:  libX11-devel
 BuildRequires:  libXext-devel
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
+BuildRequires:  tex(latex)
+%else
+BuildRequires:  tetex-latex
+%endif
 BuildRequires:  xorg-x11-proto-devel
 
-
 %description
-VDPAU is the Video Decode and Presentation API for UNIX. 
-It provides an interface to video decode acceleration and presentation
-hardware present in modern GPUs.
+VDPAU is the Video Decode and Presentation API for UNIX. It provides an
+interface to video decode acceleration and presentation hardware present in
+modern GPUs.
 
-%{?!_without_docs:
 %package        docs
 Summary:        Documentation for %{name}
-Group:          Documentation
+BuildArch:      noarch
+Provides:       libvdpau-docs = %{version}-%{release}
+Obsoletes:      libvdpau-docs < 0.6-2
 
 %description    docs
 The %{name}-docs package contains documentation for %{name}.
-}
 
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       libX11-devel
 Requires:       pkgconfig
 
 %description    devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
-
+The %{name}-devel package contains libraries and header files for developing
+applications that use %{name}.
 
 %prep
 %setup -q
-autoreconf -vif
-
 
 %build
-%configure --disable-static \
- %{?_without_docs:--disable-documentation }
-
+autoreconf -vif
+%configure --disable-static
 make %{?_smp_mflags}
 
-
 %install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-
-
+make install DESTDIR=%{buildroot} INSTALL="install -p"
+find %{buildroot} -name '*.la' -delete
+# Let %%doc macro create the correct location in the rpm file, creates a
+# versioned docdir in <= f19 and an unversioned docdir in >= f20.
+rm -fr %{buildroot}%{_docdir}
+mv doc/html-out html
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-
 %files
 %doc AUTHORS COPYING
 %config(noreplace) %{_sysconfdir}/vdpau_wrapper.cfg
 %{_libdir}/*.so.*
 %dir %{_libdir}/vdpau
-%{_libdir}/vdpau/libvdpau_trace.so*
+%{_libdir}/vdpau/%{name}_trace.so*
 
-%{?!_without_docs:
 %files docs
-%doc %{_docdir}/%{name}
-}
+%doc html
 
 %files devel
 %{_includedir}/vdpau/
-%{_libdir}/libvdpau.so
+%{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/vdpau.pc
 
-
 %changelog
+* Wed Jul 31 2013 Simone Caronni <negativo17@gmail.com> - 0.6-2
+- Enable documentation by default.
+- Clean up spec file a bit; remove el5 tags.
+- Let %%doc find the proper location for the documentation.
+
 * Mon Feb 04 2013 Nicolas Chauvet <kwizart@gmail.com> - 0.6-1
 - Update to 0.6
 
@@ -137,7 +133,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 * Mon Jun 15 2009 kwizart < kwizart at gmail.com > - 0.1-0.3git20090318
 - Add missing -ldl at link time
 
-* Fri Mar 22 2009 kwizart < kwizart at gmail.com > - 0.1-0.2git20090318
+* Sun Mar 22 2009 kwizart < kwizart at gmail.com > - 0.1-0.2git20090318
 - Backport fix thread_2
 
 * Fri Mar  6 2009 kwizart < kwizart at gmail.com > - 0.1-0.1git20090318