diff --git a/pulseaudio-4.0-187-g6f94c.tar.xz b/pulseaudio-4.0-187-g6f94c.tar.xz
new file mode 100644
index 0000000..2c5e53f
--- /dev/null
+++ b/pulseaudio-4.0-187-g6f94c.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0c38a314fe2dfffefb32709b697c9599ceaf809a21c6bc3b09a8d05709883e1c
+size 1390096
diff --git a/pulseaudio-4.0.tar.xz b/pulseaudio-4.0.tar.xz
deleted file mode 100644
index d95f3a7..0000000
--- a/pulseaudio-4.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:35ceb36bb1822fe54f0b5e4863b4f486769fdfb8ff2111f01fd8778928f9cdae
-size 1392072
diff --git a/pulseaudio.changes b/pulseaudio.changes
index d100902..7a726c4 100644
--- a/pulseaudio.changes
+++ b/pulseaudio.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Sep 25 17:48:30 UTC 2013 - dimstar@opensuse.org
+
+- bnc#840845: Update to git master (PA 5.0 on the way) (6f94c).
+  + Various code cleanups for inclusion of bluez5 stack.
+- No longer pass --enable-bluez5 --disable-bluez4 to configure:
+  master only speaks bluez5.
+
+-------------------------------------------------------------------
+Sat Sep  7 11:30:40 UTC 2013 - dimstar@opensuse.org
+
+- Update to git snapshot (rev: gbf9b3)/ bluez5 branch.
+  Note: this is not HEAD of the bluez5 branch, as in local tests,
+  this did fail to load the bluetooth modules.
+
 -------------------------------------------------------------------
 Wed Aug 21 09:38:49 UTC 2013 - dimstar@opensuse.org
 
diff --git a/pulseaudio.spec b/pulseaudio.spec
index ba267c7..14d9883 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -17,8 +17,9 @@
 
 
 Name:           pulseaudio
-Version:        4.0
+Version:        4.0+git
 Release:        0
+%define _version 4.0-187-g6f94c
 %define drvver  4.0
 %define soname  0
 %define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d
@@ -27,7 +28,8 @@ Summary:        A Networked Sound Server
 License:        GPL-2.0+ and LGPL-2.1+
 Group:          System/Sound Daemons
 Url:            http://pulseaudio.org
-Source:         http://www.freedesktop.org/software/pulseaudio/releases/%{name}-%{version}.tar.xz
+# git clone of http://cgit.freedesktop.org/pulseaudio/pulseaudio
+Source:         %{name}-%{_version}.tar.xz
 Source1:        default.pa-for-gdm
 Source2:        setup-pulseaudio
 Source3:        sysconfig.sound-pulseaudio
@@ -40,7 +42,7 @@ Patch2:         pulseaudio-wrong-memset.patch
 BuildRequires:  pkgconfig(systemd)
 %endif
 BuildRequires:  alsa-devel >= 1.0.24
-BuildRequires:  bluez-devel >= 4.99
+BuildRequires:  bluez-devel >= 5
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -65,8 +67,6 @@ BuildRequires:  tcpd-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  xorg-x11-devel
-# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
-BuildRequires:  xz
 BuildRequires:  pkgconfig(dbus-1) >= 1.4.12
 BuildRequires:  pkgconfig(gconf-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
@@ -162,7 +162,7 @@ This package includes support for Jack-based applications.
 Summary:        Bluetooth support for the PulseAudio sound server
 Group:          System/Sound Daemons
 Requires:       %{name} = %{version}
-Requires:       bluez >= 4.99
+Requires:       bluez >= 5
 
 %description module-bluetooth
 pulseaudio is a networked sound server for Linux and other Unix like
@@ -263,14 +263,13 @@ This package contains GDM integration hooks for the PulseAudio sound server.
 
 %lang_package
 %prep
-%setup -q -T -b0
-translation-update-upstream
+%setup -q -T -b0 -n %{name}-%{_version}
 %patch0
 %patch1 -p1
 %patch2
 
 %build
-autoreconf -fiv
+NOCONFIGURE=1 ./bootstrap.sh
 %configure \
         --disable-static \
         --disable-rpath \
@@ -426,7 +425,9 @@ setup-pulseaudio --auto > /dev/null
 %{_libdir}/pulse-%{drvver}/modules/module-systemd-login.so
 %endif
 %{_libdir}/pulse-%{drvver}/modules/module-tunnel-sink.so
+%{_libdir}/pulse-%{drvver}/modules/module-tunnel-sink-new.so
 %{_libdir}/pulse-%{drvver}/modules/module-tunnel-source.so
+%{_libdir}/pulse-%{drvver}/modules/module-tunnel-source-new.so
 %{_libdir}/pulse-%{drvver}/modules/module-udev-detect.so
 %{_libdir}/pulse-%{drvver}/modules/module-virtual-sink.so
 %{_libdir}/pulse-%{drvver}/modules/module-virtual-source.so