diff --git a/srcpkgs/aubio/aubio-devel.template b/srcpkgs/aubio/aubio-devel.template
index 1438824637..dda9766327 100644
--- a/srcpkgs/aubio/aubio-devel.template
+++ b/srcpkgs/aubio/aubio-devel.template
@@ -1,15 +1,13 @@
 # Template file for 'aubio-devel'.
 #
-depends="libaubio"
+noarch=yes
+depends="libaubio-${version}_${revision}"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-do_install()
-{
+do_install() {
         vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
         vmove usr/lib/pkgconfig usr/lib
 }
diff --git a/srcpkgs/aubio/template b/srcpkgs/aubio/template
index 91bc3537e3..9a11a0a2e5 100644
--- a/srcpkgs/aubio/template
+++ b/srcpkgs/aubio/template
@@ -1,21 +1,20 @@
 # Template file for 'aubio'
 pkgname=aubio
 version=0.3.2
-homepage="http://aubio.org"
-distfiles="${homepage}/pub/${pkgname}-${version}.tar.gz"
+revision=4
+subpackages="lib${pkgname} ${pkgname}-devel"
 build_style=gnu-configure
-revision=3
+configure_args="--disable-static"
+# XXX lash, pure and swig support.
 makedepends="pkg-config libsamplerate-devel fftw-devel jack-devel"
 short_desc="A library for audio labelling"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2"
+homepage="http://aubio.org"
+distfiles="${homepage}/pub/${pkgname}-${version}.tar.gz"
 checksum=dc1387b048610a6141f523c27314b7a60bd299c3d6789c372445ddc6511512cd
 long_desc="
  aubio is a tool designed for the extraction of annotations from audio signals.
  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."
-
-subpackages="lib${pkgname} ${pkgname}-devel"
-
-# XXX lash, pure and swig support.