diff --git a/libsndfile-ac.diff b/libsndfile-ac.diff
new file mode 100644
index 0000000..f141f2a
--- /dev/null
+++ b/libsndfile-ac.diff
@@ -0,0 +1,18 @@
+--- acinclude.m4
++++ acinclude.m4
+@@ -254,7 +254,6 @@
+ 	fi
+ 
+ )
+-]
+ 
+ if test $ac_cv_c_byte_order = big ; then
+ 	ac_cv_c_big_endian=1
+@@ -273,6 +272,7 @@
+ 	AC_MSG_WARN([[*****************************************************************]])
+ 	fi
+ 
++]
+ )# AC_C_FIND_ENDIAN
+ 
+ 
diff --git a/libsndfile.changes b/libsndfile.changes
index 2150597..edd08cd 100644
--- a/libsndfile.changes
+++ b/libsndfile.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Apr 16 13:56:20 CEST 2007 - tiwai@suse.de
+
+- Move docs and manpages to appropriate sub-packages (#264820)
+- Remove static library (#264820)
+
+-------------------------------------------------------------------
+Mon Apr 16 11:12:42 CEST 2007 - schwab@suse.de
+
+- Fix quoting in autoconf macros.
+
 -------------------------------------------------------------------
 Fri Apr 13 14:50:15 CEST 2007 - tiwai@suse.de
 
diff --git a/libsndfile.spec b/libsndfile.spec
index d26ce16..30f168a 100644
--- a/libsndfile.spec
+++ b/libsndfile.spec
@@ -14,13 +14,14 @@ Name:           libsndfile
 BuildRequires:  alsa-devel flac-devel gcc-c++ libstdc++-devel pkgconfig sqlite-devel
 Summary:        A Library to Handle Various Audio File Formats
 Version:        1.0.17
-Release:        35
+Release:        36
 License:        GNU Library General Public License v. 2.0 and 2.1 (LGPL)
 Group:          System/Libraries
 Obsoletes:      libsnd
 Provides:       libsnd
 Source:         libsndfile-%{version}.tar.bz2
 Patch:          libsndfile-flac-1.1.4-fix.diff
+Patch1:         libsndfile-ac.diff
 URL:            http://www.mega-nerd.com/libsndfile/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -86,6 +87,7 @@ Authors:
 %prep
 %setup
 %patch
+%patch1
 
 %build
 %define warn_flags -W -Wall -Wstrict-prototypes -Wpointer-arith -Wno-unused-parameter
@@ -93,11 +95,14 @@ autoreconf --force --install
 %{?suse_update_config:%{suse_update_config -f}}
 CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing %{warn_flags}"
 export CFLAGS
-./configure --prefix=%{_prefix} --libdir=%{_libdir} --mandir=%{_mandir}
+./configure --prefix=%{_prefix} --libdir=%{_libdir} --mandir=%{_mandir} \
+	--disable-static
 make
 
 %install
 make DESTDIR="$RPM_BUILD_ROOT" install
+# remove unnecessary files
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 # remove binaries from examples directory
 make -C examples distclean
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libsndfile1-dev
@@ -113,20 +118,18 @@ test "$RPM_BUILD_ROOT" != "/" -a -d "$RPM_BUILD_ROOT" && rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root)
-%doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-%doc doc/*.html doc/*.jpg doc/*.css doc/*.HOWTO
 %{_libdir}/libsndfile.so.*
-%{_mandir}/man?/*
 
 %files progs
 %defattr(-, root, root)
 %{_bindir}/*
+%doc %{_mandir}/man?/*
 
 %files devel
 %defattr(-, root, root)
+%doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+%doc doc/*.html doc/*.jpg doc/*.css doc/*.HOWTO
 %{_libdir}/libsndfile.so
-%{_libdir}/libsndfile.a
-%{_libdir}/libsndfile.la
 %{_includedir}/sndfile.h
 %{_includedir}/sndfile.hh
 %{_libdir}/pkgconfig/*.pc
@@ -142,6 +145,11 @@ test "$RPM_BUILD_ROOT" != "/" -a -d "$RPM_BUILD_ROOT" && rm -rf $RPM_BUILD_ROOT
 %{_datadir}/octave/site/m/sndfile_save.m
 
 %changelog
+* Mon Apr 16 2007 - tiwai@suse.de
+- Move docs and manpages to appropriate sub-packages (#264820)
+- Remove static library (#264820)
+* Mon Apr 16 2007 - schwab@suse.de
+- Fix quoting in autoconf macros.
 * Fri Apr 13 2007 - tiwai@suse.de
 - fix FLAC-1.1.4 support.
 * Fri Sep 01 2006 - tiwai@suse.de