diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index bc7a391c1a..6ce7de9883 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,17 +1,18 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=3.0
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap
  --enable-jack --disable-lirc --disable-hal-compat --disable-gconf --enable-orc
  --with-database=tdb --with-udev-rules-dir=/usr/lib/udev/rules.d
  --disable-bluez --disable-esound"
-makedepends="pkg-config intltool zlib-devel gtk+-devel libltdl-devel
- speex-devel libXi-devel libXtst-devel xcb-util-devel libsndfile-devel
- libasyncns-devel dbus-devel tdb-devel libcap-devel
- avahi-libs-devel openssl-devel libsamplerate-devel json-c-devel orc-devel
- jack-devel fftw-devel systemd-devel webrtc-audio-processing-devel sbc-devel
+hostmakedepends="pkg-config intltool which"
+makedepends="zlib-devel gtk+-devel libltdl-devel speex-devel libXi-devel
+ libXtst-devel xcb-util-devel libsndfile-devel libasyncns-devel
+ dbus-devel tdb-devel libcap-devel avahi-libs-devel openssl-devel
+ libsamplerate-devel json-c-devel>=0.11_2 orc-devel jack-devel fftw-devel
+ systemd-devel webrtc-audio-processing-devel sbc-devel
  libcap-progs libxcb-devel libXtst-devel libSM-devel rtkit"
 short_desc="A featureful, general-purpose sound server"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -19,30 +20,16 @@ homepage="http://www.freedesktop.org/wiki/Software/PulseAudio"
 license="LGPL-2"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.xz"
 checksum=c90bfda29605942d08e3e218ef10e3c660506a06651a616bfbb6a6df8392836d
-long_desc="
- PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
- WIN32 systems. It is a drop in replacement for the ESD sound server with much
- better latency, mixing/re-sampling quality and overall architecture.
 
- These are some of PulseAudio's features:
-
-  * High quality software mixing of multiple audio streams with support for
-    more than one sink/source. May be used to combine multiple sound cards
-    into one (with sample rate adjustment).
-
-  * Wide range of supported client libraries. ESD, ALSA, oss, libao and
-    GStreamer client applications are supported as-is. Native PulseAudio
-    plug-ins are also available for xmms and mplayer.
-
-  * Good low latency behaviour and very accurate latency measurement for
-    playback and recording. Ability to fully synchronize multiple playback
-    streams.
-
-  * Network transparency, allowing an application to play back or record
-    audio on a different machine than the one it is running on.
-
-  * Extensible plug-in architecture with plug-ins for jackd, multicast-rtp
-    lirc and avahi, just to name a few."
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" automake libtool gettext-devel glib-devel orc-devel"
+	pre_configure() {
+		autoreconf -fi
+	}
+	# XXX disable neon for now.
+	configure_args+=" --disable-neon-opt"
+	configure_args+="  ac_cv_func_alloca_works=yes"
+fi
 
 post_install() {
 	vinstall ${FILESDIR}/pulseaudio.xinit 755 \