diff --git a/libaubio.spec b/libaubio.spec
index be141ea..a0492ed 100644
--- a/libaubio.spec
+++ b/libaubio.spec
@@ -1,13 +1,13 @@
 Name:          libaubio
-Version:       0.3.2
-Release:       2mamba
+Version:       0.4.1
+Release:       1mamba
 Summary:       A library for audio labelling
 Group:         System/Libraries
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://aubio.piem.org/
-Source:        http://aubio.piem.org/pub/aubio-%{version}.tar.gz
+Source:        http://aubio.piem.org/pub/aubio-%{version}.tar.bz2
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
@@ -17,12 +17,14 @@ BuildRequires: libfftw-devel
 BuildRequires: libjack-devel
 BuildRequires: liblash-devel
 BuildRequires: libpython-devel
+BuildRequires: libavresample-ffmpeg-devel
 BuildRequires: libsamplerate-devel
 BuildRequires: libsndfile-devel
 BuildRequires: libuuid-devel
 BuildRequires: libxml2-devel
 ## AUTOBUILDREQ-END
 BuildRequires: puredata
+BuildRequires: txt2man
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 
@@ -59,60 +61,117 @@ Python bindings to %{name}.
 aubio is a library for audio labelling. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio. The name aubio comes from 'audio' with a typo: several transcription errors are likely to be found in the results too.
 The aim of this project is to provide these automatic labelling features to other audio softwares. Functions can be used offline in sound editors and software samplers, or online in audio effects and virtual instruments.
 
+%package apidocs
+Group:         Documentation
+Summary:       %{name} API documentation
+Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
+Requires:      gtk-doc
+
+%description apidocs
+This package includes the %{name} API documentation.
+
 %prep
 %setup -q -n aubio-%{version}
 
 %build
-%configure \
-   LIBS="-lm -lpthread"
+./waf configure \
+   --prefix=%{_prefix} \
+   --libdir=%{_libdir}
 
-%make
+./waf %{?_smp_mflags} build
+
+#% configure \
+#   LIBS="-lm -lpthread"
 
 %install
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
-%makeinstall
+./waf install \
+   --libdir=%{_libdir} \
+   --destdir=%{buildroot}
+
+%ifarch x86_64
+mv %{buildroot}%{_prefix}/lib/* %{buildroot}%{_libdir}/
+%endif
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
 
 %files
+%defattr(-,root,root)
 %{_libdir}/libaubio.so.*
-%{_libdir}/libaubioext.so.*
-%{_datadir}/sounds/aubio/woodblock.aiff
-%{_prefix}/lib/pd/doc/5.reference/*.pd
-%dir %{_prefix}/lib/pd/doc/aubio
-%{_prefix}/lib/pd/doc/aubio/onset-cam.pd
-%{_prefix}/lib/pd/extra/aubio.pd_linux
+#%{_libdir}/libaubioext.so.*
+#%{_datadir}/sounds/aubio/woodblock.aiff
+#%{_prefix}/lib/pd/doc/5.reference/*.pd
+#%dir %{_prefix}/lib/pd/doc/aubio
+#%{_prefix}/lib/pd/doc/aubio/onset-cam.pd
+#%{_prefix}/lib/pd/extra/aubio.pd_linux
 %doc AUTHORS COPYING
 
 %files devel
 %defattr(-,root,root)
 %{_libdir}/libaubio.a
-%{_libdir}/libaubio.la
+#%{_libdir}/libaubio.la
 %{_libdir}/libaubio.so
-%{_libdir}/libaubioext.a
-%{_libdir}/libaubioext.la
-%{_libdir}/libaubioext.so
+#%{_libdir}/libaubioext.a
+#%{_libdir}/libaubioext.la
+#%{_libdir}/libaubioext.so
 %dir %{_includedir}/aubio/
 %{_includedir}/aubio/*.h
-%{_includedir}/aubio/midi/*.h
+%dir %{_includedir}/aubio/io
+%{_includedir}/aubio/io/*.h
+%dir %{_includedir}/aubio/onset
+%{_includedir}/aubio/onset/*.h
+%dir %{_includedir}/aubio/pitch
+%{_includedir}/aubio/pitch/*.h
+%dir %{_includedir}/aubio/spectral
+%{_includedir}/aubio/spectral/*.h
+%dir %{_includedir}/aubio/synth
+%{_includedir}/aubio/synth/*.h
+%dir %{_includedir}/aubio/tempo
+%{_includedir}/aubio/tempo/*.h
+%dir %{_includedir}/aubio/temporal
+%{_includedir}/aubio/temporal/*.h
+%dir %{_includedir}/aubio/utils
+%{_includedir}/aubio/utils/*.h
+#%{_includedir}/aubio/midi/*.h
 %{_libdir}/pkgconfig/aubio.pc
-%doc ChangeLog README THANKS TODO
+%doc ChangeLog
 
 %files tools
 %defattr(-,root,root)
-%{_bindir}/aubiocut
+#%{_bindir}/aubiocut
+%{_bindir}/aubiomfcc
 %{_bindir}/aubionotes
 %{_bindir}/aubioonset
 %{_bindir}/aubiopitch
+%{_bindir}/aubioquiet
 %{_bindir}/aubiotrack
+%{_mandir}/man1/aubiocut.1*
+%{_mandir}/man1/aubiomfcc.1*
+%{_mandir}/man1/aubionotes.1*
+%{_mandir}/man1/aubioonset.1*
+%{_mandir}/man1/aubiopitch.1*
+%{_mandir}/man1/aubioquiet.1*
+%{_mandir}/man1/aubiotrack.1*
 
-%files -n python-aubio
+#%files -n python-aubio
+#%defattr(-,root,root)
+#%dir %{python_sitelib}/aubio
+#%{python_sitelib}/aubio/*
+
+%files apidocs
 %defattr(-,root,root)
-%dir %{python_sitelib}/aubio
-%{python_sitelib}/aubio/*
+%dir %{_docdir}/libaubio-doc
+%dir %{_docdir}/libaubio-doc/html
+%{_docdir}/libaubio-doc/html/*
 
 %changelog
+* Tue Apr 01 2014 Automatic Build System <autodist@mambasoft.it> 0.4.1-1mamba
+- automatic version update by autodist
+
+* Sat Feb 01 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 0.4.0-1mamba
+- update to 0.4.0
+
 * Tue Aug 27 2013 Automatic Build System <autodist@mambasoft.it> 0.3.2-2mamba
 - automatic rebuild by autodist