diff --git a/common/shlibs b/common/shlibs
index cc60bd6f850..b2cb80cc82b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -696,6 +696,7 @@ libpulse-mainloop-glib.so.0 libpulseaudio-1.0_1
 libpulse-simple.so.0 libpulseaudio-1.0_1
 libpulsecommon-5.0.so libpulseaudio-5.0_1
 libpulsecommon-6.0.so libpulseaudio-6.0_1
+libpulsecommon-7.0.so libpulseaudio-7.0_1
 liborc-0.4.so.0 orc-0.4.11_1
 liborc-test-0.4.so.0 orc-0.4.11_1
 libgmime-2.6.so.0 gmime-2.6.4_1
diff --git a/srcpkgs/pulseaudio/patches/musl.patch b/srcpkgs/pulseaudio/patches/musl.patch
new file mode 100644
index 00000000000..43682e3afb3
--- /dev/null
+++ b/srcpkgs/pulseaudio/patches/musl.patch
@@ -0,0 +1,48 @@
+Portability fixes for musl:
+
+- _WORDIZE is declared in <bits/user.h> via <sys/user.h>.
+- <xlocale.h> does not exist, check for it correctly.
+
+	--xtraeme
+
+--- configure.ac.orig	2015-09-24 11:36:06.107661526 +0200
++++ configure.ac	2015-09-24 11:36:40.420036775 +0200
+@@ -407,7 +407,7 @@ AC_HEADER_STDC
+ # POSIX
+ AC_CHECK_HEADERS_ONCE([arpa/inet.h glob.h grp.h netdb.h netinet/in.h \
+     netinet/in_systm.h netinet/tcp.h poll.h pwd.h sched.h \
+-    sys/mman.h sys/select.h sys/socket.h sys/wait.h \
++    sys/mman.h sys/select.h sys/socket.h sys/wait.h sys/user.h xlocale.h \
+     sys/uio.h syslog.h sys/dl.h dlfcn.h linux/sockios.h])
+ AC_CHECK_HEADERS([netinet/ip.h], [], [],
+                  [#include <sys/types.h>
+--- src/pulsecore/sample-util.h.orig	2015-09-24 11:37:57.773677238 +0200
++++ src/pulsecore/sample-util.h	2015-09-24 11:38:46.668208677 +0200
+@@ -24,6 +24,14 @@
+ #include <inttypes.h>
+ #include <limits.h>
+ 
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#ifdef HAVE_SYS_USER_H
++#include <sys/user.h>	/* required by _WORDIZE with musl */
++#endif
++
+ #include <pulse/gccmacro.h>
+ #include <pulse/sample.h>
+ #include <pulse/volume.h>
+--- src/pulsecore/core-util.c.orig	2015-09-24 11:45:57.919919956 +0200
++++ src/pulsecore/core-util.c	2015-09-24 11:46:23.343196284 +0200
+@@ -54,7 +54,9 @@
+ 
+ #ifdef HAVE_STRTOD_L
+ #include <locale.h>
+-#include <xlocale.h>
++# ifdef HAVE_XLOCALE_H
++#  include <xlocale.h>
++# endif
+ #endif
+ 
+ #ifdef HAVE_SCHED_H
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index aebeb515ccc..f37f6c6a8cf 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
-version=6.0
-revision=9
+version=7.0
+revision=1
 build_pie=yes
 build_style=gnu-configure
 configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap
@@ -9,7 +9,7 @@ configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap
  --with-database=tdb --with-udev-rules-dir=/usr/lib/udev/rules.d --disable-bluez4
  --disable-esound --disable-gtk3 --enable-bluez5 --disable-bluez5-ofono-headset
  --disable-systemd --disable-systemd-journal"
-hostmakedepends="automake libtool pkg-config intltool orc-devel"
+hostmakedepends="automake libtool pkg-config intltool gettext-devel orc-devel"
 makedepends="
  zlib-devel libltdl-devel libglib-devel libudev-devel speex-devel libXi-devel
  libXtst-devel xcb-util-devel libsndfile-devel libasyncns-devel
@@ -31,23 +31,18 @@ system_accounts="pulse"
 pulse_groups="audio"
 pulse_homedir="/var/run/pulse"
 distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.xz"
-checksum=b50640e0b80b1607600accfad2e45aabb79d379bf6354c9671efa2065477f6f6
+checksum=ca1ae1377e8926bfc3ffe2aeb9f657f6c363a16f72861166fcf9454e3eeae8fa
 
 pre_configure() {
-	libtoolize -f
-	touch aclocal.m4 Makefile.in config.h.in
+	NOCONFIGURE=1 ./bootstrap.sh
 }
-
 post_install() {
 	rm -f ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf
-	vmkdir usr/share/bash-completion/completions
-	mv ${DESTDIR}/etc/bash_completion.d/* \
-		${DESTDIR}/usr/share/bash-completion/completions
 	vsv pulseaudio
 }
 
 libpulseaudio_package() {
-	shlib_provides="libpulsecommon-6.0.so"
+	shlib_provides="libpulsecommon-7.0.so"
 	short_desc+=" - shared libraries"
 	pkg_install() {
 		vmove "usr/lib/libpulse.so.*"