diff --git a/libvorbis-doc-fixes.diff b/libvorbis-doc-fixes.diff
new file mode 100644
index 0000000..5890fb5
--- /dev/null
+++ b/libvorbis-doc-fixes.diff
@@ -0,0 +1,13 @@
+--- doc/vorbisenc/index.html-dist	2007-07-27 13:03:36.000000000 +0200
++++ doc/vorbisenc/index.html	2007-07-27 13:04:01.000000000 +0200
+@@ -20,8 +20,10 @@
+ <p>
+ <a href="overview.html">libvorbisenc api overview</a><br>
+ <a href="reference.html">libvorbisenc api reference</a><br>
++<!--
+ <a href="changes.html">libvorbisenc api changes from 1.0 and 1.0.1</a><br>
+ <a href="examples.html">libvorbisenc encode setup examples</a><br>
++ -->
+ 
+ <br><br>
+ <hr noshade>
diff --git a/libvorbis.changes b/libvorbis.changes
index bf66c15..f7a808f 100644
--- a/libvorbis.changes
+++ b/libvorbis.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jul 27 12:56:43 CEST 2007 - tiwai@suse.de
+
+- fix the documentation link (#293784)
+- split documentation to doc subpackage
+- remove -fno-strict-aliasing gcc option
+
 -------------------------------------------------------------------
 Mon Jul  9 10:48:33 CEST 2007 - tiwai@suse.de
 
diff --git a/libvorbis.spec b/libvorbis.spec
index cff8803..11bf35f 100644
--- a/libvorbis.spec
+++ b/libvorbis.spec
@@ -14,7 +14,7 @@ Name:           libvorbis
 BuildRequires:  libogg-devel pkgconfig
 Summary:        The Vorbis General Audio Compression Codec
 Version:        1.1.2
-Release:        64
+Release:        65
 Group:          System/Libraries
 License:        BSD 3-Clause
 URL:            http://www.vorbis.com/
@@ -25,6 +25,7 @@ Patch5:         libvorbis-%{version}-aotuv-b5.diff
 Patch6:         libvorbis-%{version}-warning-fixes.diff
 Patch7:         libvorbis-cflags.diff
 Patch8:         libvorbis-maptype-check.diff
+Patch9:         libvorbis-doc-fixes.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -54,6 +55,21 @@ to compile and develop applications that use libvorbis.
 
 
 
+Authors:
+--------
+    Monty <monty@xiph.org>
+    Xiphophorus Company <team@xiph.org>
+
+%package doc
+Summary:        Documentation of Ogg/Vorbis library
+Group:          Documentation/Other
+
+%description doc
+This package contains documents for Ogg/Vorbis library, including the
+API reference.
+
+
+
 Authors:
 --------
     Monty <monty@xiph.org>
@@ -66,23 +82,27 @@ Authors:
 %patch6
 %patch7
 %patch8
+%patch9
 if [ "%_lib" == "lib64" ]; then
 %patch1
 fi
 
 %build
 %{?suse_update_config:%{suse_update_config -f}}
-autoreconf --force --install
-CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fstack-protector" \
-./configure --prefix=%{_prefix} --libdir=%{_libdir} \
+autoreconf -fi
+%configure \
 	--with-ogg-libraries=%{_libdir} \
 	--disable-static
 make
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT docdir=%{_docdir}/%{name}-devel install
-cp COPYING AUTHORS README $RPM_BUILD_ROOT%{_docdir}/%{name}-devel
-cp *.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-devel
+%makeinstall
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
+mv $RPM_BUILD_ROOT%{_datadir}/doc/libvorbis-* $RPM_BUILD_ROOT%{_docdir}/%{name}/html
+install -c -m 0644 doc/Vorbis_I_spec.* $RPM_BUILD_ROOT%{_docdir}/%{name}/html
+ln -s white-xifish.png $RPM_BUILD_ROOT%{_docdir}/%{name}/html/fish_xiph_org.png
+cp COPYING AUTHORS README $RPM_BUILD_ROOT%{_docdir}/%{name}
+cp *.txt $RPM_BUILD_ROOT%{_docdir}/%{name}
 # remove unneeded files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
@@ -101,13 +121,20 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %files devel
 %defattr(-,root,root)
-%doc %{_docdir}/%{name}-devel
 %{_datadir}/aclocal/*.m4
 %{_includedir}/vorbis
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 
+%files doc
+%defattr(-,root,root)
+%doc %{_docdir}/%{name}
+
 %changelog
+* Fri Jul 27 2007 - tiwai@suse.de
+- fix the documentation link (#293784)
+- split documentation to doc subpackage
+- remove -fno-strict-aliasing gcc option
 * Mon Jul 09 2007 - tiwai@suse.de
 - fix array boundary conditional flaw in mapping (#287124,
   CVE-2007-3106)