diff --git a/liboggz.spec b/liboggz.spec
index 46f03a0..4e61496 100644
--- a/liboggz.spec
+++ b/liboggz.spec
@@ -1,12 +1,12 @@
 Name:           liboggz
 Version:        1.1.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Simple programming interface for Ogg files and streams
 
 Group:          System Environment/Libraries
 License:        BSD
-URL:            http://www.annodex.net/
-Source0:        http://www.annodex.net/software/liboggz/download/%{name}-%{version}.tar.gz
+URL:            http://www.xiph.org/oggz/
+Source0:        http://downloads.xiph.org/releases/liboggz/%{name}-%{version}.tar.gz
 # Always have oggz_off_t == loff_t even on 64-bit platforms
 Patch0:		liboggz-1.1.1-multilib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,14 +69,13 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall docdir=$RPM_BUILD_ROOT%{_datadir}/doc/%{name}-doc-%{version} \
-	     INSTALL="%{__install} -p"
+%makeinstall docdir=$PWD/__docs_staging INSTALL="%{__install} -p"
 
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # not particularly interested in the tex docs, the html version has everything
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-doc-%{version}/latex
+rm -rf __docs_staging/latex
 
 # Multilib fix: ensure generated headers have timestamps
 # independent of build time
@@ -111,10 +110,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files doc
 %defattr(-,root,root)
-%doc %{_docdir}/%{name}-doc-%{version}
+%doc __docs_staging/*
 
 
 %changelog
+* Sat Jul 27 2013 Ville Skyttä <ville.skytta@iki.fi> - 1.1.1-6
+- Make docs install work with unversioned doc dir setups.
+- Fix URLs.
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild