diff --git a/libvorbis.changes b/libvorbis.changes
index 8aa1088..d654f74 100644
--- a/libvorbis.changes
+++ b/libvorbis.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Apr 16 15:07:19 CEST 2007 - tiwai@suse.de
+
+- follow library packaging policy
+  * move docs to devel package
+  * remove static library
+- remove obsolete m4 files
+
 -------------------------------------------------------------------
 Wed Jan 25 21:37:47 CET 2006 - mls@suse.de
 
diff --git a/libvorbis.spec b/libvorbis.spec
index 3fa9592..748ab4a 100644
--- a/libvorbis.spec
+++ b/libvorbis.spec
@@ -1,35 +1,35 @@
 #
 # spec file for package libvorbis (Version 1.1.2)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
-# Please submit bugfixes or comments via http://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
 
-Name:         libvorbis
-BuildRequires: libogg-devel pkgconfig
-Summary:      The Vorbis General Audio Compression Codec
-Version:      1.1.2
-Release:      2
-Group:        System/Libraries
-License:      BSD
-URL:          http://www.vorbis.com/
-Source:       %{name}-%{version}.tar.bz2
-Patch1:       libvorbis-lib64.dif
-Patch2:       libvorbis-m4.dif
+Name:           libvorbis
+BuildRequires:  libogg-devel pkgconfig
+Summary:        The Vorbis General Audio Compression Codec
+Version:        1.1.2
+Release:        43
+Group:          System/Libraries
+License:        BSD License and BSD-like
+URL:            http://www.vorbis.com/
+Source:         %{name}-%{version}.tar.bz2
+Patch1:         libvorbis-lib64.dif
+Patch2:         libvorbis-m4.dif
 # Patch5:       libvorbis-%{version}-aotuv-b4.diff
-Patch6:       libvorbis-%{version}-warning-fixes.diff
-Patch7:       libvorbis-cflags.diff
-BuildRoot:    %{_tmppath}/%{name}-%{version}-build
+Patch6:         libvorbis-%{version}-warning-fixes.diff
+Patch7:         libvorbis-cflags.diff
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free,
+Ogg Vorbis is a fully open, nonproprietary, patent-and-royalty-free,
 and general-purpose compressed audio format for audio and music at
-fixed and variable bitrates from 16 to 128 kbps/channel.
+fixed and variable bit rates from 16 to 128 kbps/channel.
 
 
 
@@ -39,10 +39,10 @@ Authors:
     Xiphophorus Company <team@xiph.org>
 
 %package devel
-Summary:      Include Files and Libraries mandatory for Development.
-Group:        Development/Libraries/C and C++
-Requires:     glibc-devel, libogg-devel
-Requires:     %{name} = %{version}
+Summary:        Include Files and Libraries mandatory for Development.
+Group:          Development/Libraries/C and C++
+Requires:       glibc-devel, libogg-devel
+Requires:       %{name} = %{version}
 
 %description devel
 This package contains all necessary include files and libraries needed
@@ -69,13 +69,16 @@ fi
 %{?suse_update_config:%{suse_update_config -f}}
 autoreconf --force --install
 CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fstack-protector" \
-./configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ogg-libraries=%{_libdir}
+./configure --prefix=%{_prefix} --libdir=%{_libdir} \
+	--with-ogg-libraries=%{_libdir} \
+	--disable-static
 make
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT docdir=%{_docdir}/%{name}-devel install
-# create an old compatible m4 file
-sed -e s/XIPH_PATH_VORBIS/AM_PATH_VORBIS/g < $RPM_BUILD_ROOT%{_datadir}/aclocal/vorbis.m4 > $RPM_BUILD_ROOT%{_datadir}/aclocal/vorbis-old.m4
+cp COPYING AUTHORS README $RPM_BUILD_ROOT%{_docdir}/%{name}-devel
+# remove unneeded files
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %post
 %run_ldconfig
@@ -88,8 +91,6 @@ sed -e s/XIPH_PATH_VORBIS/AM_PATH_VORBIS/g < $RPM_BUILD_ROOT%{_datadir}/aclocal/
 
 %files
 %defattr(-,root,root)
-%doc COPYING AUTHORS README
-# %doc aoTuV*
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -97,12 +98,15 @@ sed -e s/XIPH_PATH_VORBIS/AM_PATH_VORBIS/g < $RPM_BUILD_ROOT%{_datadir}/aclocal/
 %doc %{_docdir}/%{name}-devel
 %{_datadir}/aclocal/*.m4
 %{_includedir}/vorbis
-%{_libdir}/lib*.a
 %{_libdir}/lib*.so
-%{_libdir}/lib*.la
 %{_libdir}/pkgconfig/*.pc
 
-%changelog -n libvorbis
+%changelog
+* Mon Apr 16 2007 - tiwai@suse.de
+- follow library packaging policy
+  * move docs to devel package
+  * remove static library
+- remove obsolete m4 files
 * Wed Jan 25 2006 - mls@suse.de
 - converted neededforbuild to BuildRequires
 * Wed Jan 11 2006 - tiwai@suse.de