diff --git a/srcpkgs/speex/speex-devel.template b/srcpkgs/speex/speex-devel.template
index 58ecc4f534a..28a5ac0cdfb 100644
--- a/srcpkgs/speex/speex-devel.template
+++ b/srcpkgs/speex/speex-devel.template
@@ -1,6 +1,7 @@
 # Template file for 'speex-devel'.
 #
-depends="glibc-devel libspeex"
+noarch=yes
+depends="libspeex-${version}_${revision}"
 short_desc="${sourcepkg} development files"
 long_desc="
  Speex is an audio codec especially designed for compressing voice at low
@@ -10,14 +11,9 @@ long_desc="
 
  This package contains files for development, headers, static libs, etc."
 
-
-
-do_install()
-{
+do_install() {
 	install -d ${DESTDIR}/usr/{lib,share}
-
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/share/{doc,aclocal} ${DESTDIR}/usr/share
 }
diff --git a/srcpkgs/speex/template b/srcpkgs/speex/template
index d629e11c9d7..2e39060ac17 100644
--- a/srcpkgs/speex/template
+++ b/srcpkgs/speex/template
@@ -1,12 +1,14 @@
 # Template file for 'speex'.
 pkgname=speex
 version=1.2rc1
-revision=3
-distfiles="http://downloads.xiph.org/releases/speex/speex-$version.tar.gz"
+revision=4
+subpackages="libspeex $pkgname-devel"
 build_style=gnu-configure
+configure_args="--disable-static"
 makedepends="pkg-config libogg-devel"
 short_desc="A free codec for free speech"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://downloads.xiph.org/releases/speex/speex-$version.tar.gz"
 checksum=342f30dc57bd4a6dad41398365baaa690429660b10d866b7d508e8f1179cb7a6
 long_desc="
  Speex is an audio codec especially designed for compressing voice at low
@@ -15,5 +17,3 @@ long_desc="
  emphasis on high-quality music reproduction.
 
  This package contains the encoder and decoder command-line applications."
-
-subpackages="libspeex $pkgname-devel"