diff --git a/pulseaudio-1.1.tar.xz b/pulseaudio-1.1.tar.xz
deleted file mode 100644
index eb73153..0000000
--- a/pulseaudio-1.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee
-size 1306168
diff --git a/pulseaudio-2.0.tar.xz b/pulseaudio-2.0.tar.xz
new file mode 100644
index 0000000..31b9db9
--- /dev/null
+++ b/pulseaudio-2.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:28b42edd42f4879a6884af5f0ec11801ac001eb7582881215b36649aa37e2061
+size 1353708
diff --git a/pulseaudio-remove_broken_assert.patch b/pulseaudio-remove_broken_assert.patch
deleted file mode 100644
index 8f0613e..0000000
--- a/pulseaudio-remove_broken_assert.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/pulsecore/resampler.c.orig	2012-02-17 21:34:37.154883446 +0100
-+++ src/pulsecore/resampler.c	2012-02-17 21:34:51.272882943 +0100
-@@ -1227,7 +1227,6 @@
-     data.end_of_input = 0;
- 
-     pa_assert_se(src_process(r->src.state, &data) == 0);
--    pa_assert((unsigned) data.input_frames_used == in_n_frames);
- 
-     pa_memblock_release(input->memblock);
-     pa_memblock_release(output->memblock);
diff --git a/pulseaudio-rpmlintrc b/pulseaudio-rpmlintrc
new file mode 100644
index 0000000..f591480
--- /dev/null
+++ b/pulseaudio-rpmlintrc
@@ -0,0 +1,3 @@
+setBadness('shlib-fixed-dependency', 0)
+addFilter('shlib-fixed-dependency .* config.*libpulse')
+
diff --git a/pulseaudio-wrong-memset.patch b/pulseaudio-wrong-memset.patch
index bc1d7c8..8d917f0 100644
--- a/pulseaudio-wrong-memset.patch
+++ b/pulseaudio-wrong-memset.patch
@@ -1,21 +1,17 @@
-Index: pulseaudio-1.1/src/modules/rtp/rtp.c
-===================================================================
---- pulseaudio-1.1.orig/src/modules/rtp/rtp.c
-+++ pulseaudio-1.1/src/modules/rtp/rtp.c
-@@ -286,7 +286,7 @@ int pa_rtp_recv(pa_rtp_context *c, pa_me
+--- src/modules/rtp/rtp.c.orig	2012-05-20 09:23:37.081609264 +0200
++++ src/modules/rtp/rtp.c	2012-05-20 09:24:08.991608129 +0200
+@@ -286,7 +286,7 @@
  
      if (!found_tstamp) {
-         pa_log_warn("Couldn't find SO_TIMESTAMP data in auxiliary recvmsg() data!");
+         pa_log_warn("Couldn't find SCM_TIMESTAMP data in auxiliary recvmsg() data!");
 -        memset(tstamp, 0, sizeof(tstamp));
 +        memset(tstamp, 0, sizeof(struct timeval));
      }
  
      return 0;
-Index: pulseaudio-1.1/src/modules/echo-cancel/adrian-aec.c
-===================================================================
---- pulseaudio-1.1.orig/src/modules/echo-cancel/adrian-aec.c
-+++ pulseaudio-1.1/src/modules/echo-cancel/adrian-aec.c
-@@ -163,7 +163,7 @@ static void AEC_leaky(AEC *a)
+--- src/modules/echo-cancel/adrian-aec.c.orig	2012-05-20 09:24:20.836607707 +0200
++++ src/modules/echo-cancel/adrian-aec.c	2012-05-20 09:26:07.641603903 +0200
+@@ -163,7 +163,7 @@
      } else if (1 == a->hangover) {
        --(a->hangover);
        // My Leaky NLMS is to erase vector w when hangover expires
diff --git a/pulseaudio.changes b/pulseaudio.changes
index 6e3b3ec..36c7a1c 100644
--- a/pulseaudio.changes
+++ b/pulseaudio.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 19 20:45:28 UTC 2012 - pascal.bleser@opensuse.org
+
+- update to 2.0
+
 -------------------------------------------------------------------
 Fri Feb 17 20:57:09 UTC 2012 - pascal.bleser@opensuse.org
 
diff --git a/pulseaudio.spec b/pulseaudio.spec
index a631a72..641644f 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -16,11 +16,11 @@
 #
 
 
-
 Name:           pulseaudio
-Version:        1.1
+Version:        2.0
 Release:        0
-%define drvver  1.1
+%define drvver  2.0
+%define soname  0
 Summary:        A Networked Sound Server
 License:        GPL-2.0+ ; LGPL-2.1+
 Group:          System/Sound Daemons
@@ -29,16 +29,19 @@ Source:         http://freedesktop.org/software/pulseaudio/releases/%{name}-%{ve
 Source1:        default.pa-for-gdm
 Source2:        setup-pulseaudio
 Source3:        sysconfig.sound-pulseaudio
+Source98:       pulseaudio-rpmlintrc
 Source99:       baselibs.conf
 Patch0:         disabled-start.diff
 Patch1:         suppress-socket-error-msg.diff
 Patch2:         pulseaudio-wrong-memset.patch
-# PATCH-FIX-UPSTREAM pulseaudio-remove_broken_assert.patch fdo#47156 pascal.bleser@opensuse.org -- Fix crash
-Patch3:         pulseaudio-remove_broken_assert.patch
+%if 0%{?suse_version} >= 1210
+BuildRequires:  systemd-devel
+%endif
 BuildRequires:  alsa-devel
 BuildRequires:  bluez-devel
 BuildRequires:  doxygen
 BuildRequires:  fdupes
+BuildRequires:  gcc-c++
 BuildRequires:  gdbm-devel
 BuildRequires:  intltool
 BuildRequires:  jack-devel
@@ -47,18 +50,19 @@ BuildRequires:  libopenssl-devel
 BuildRequires:  libsamplerate-devel
 BuildRequires:  libsndfile-devel
 #our libtdb-devel does not have a .pc file
+BuildRequires:  fftw3-devel
+BuildRequires:  libcap-devel
 BuildRequires:  libtdb-devel
 BuildRequires:  libtool
 BuildRequires:  libudev-devel >= 143
+BuildRequires:  libwebrtc_audio_processing-devel
 BuildRequires:  lirc-devel
+BuildRequires:  orc
 BuildRequires:  speex-devel
 BuildRequires:  tcpd-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  xorg-x11-devel
-BuildRequires:  libcap-devel
-BuildRequires:  fftw3-devel
-BuildRequires:  orc
 # Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
 BuildRequires:  xz
 BuildRequires:  pkgconfig(gconf-2.0)
@@ -173,13 +177,13 @@ improved drop-in replacement for the Enlightened Sound Daemon (ESOUND).
 
 This package provides gconf storage of PulseAudio sound server settings.
 
-%package -n libpulse0
+%package -n libpulse%{soname}
 Summary:        Client interface to PulseAudio
 Group:          System/Libraries
 Provides:       pulseaudio-libs = %{version}
 Obsoletes:      pulseaudio-libs < %{version}
 
-%description -n libpulse0
+%description -n libpulse%{soname}
 pulseaudio is a networked sound server for Linux and other Unix like
 operating systems and Microsoft Windows. It is intended to be an
 improved drop-in replacement for the Enlightened Sound Daemon (ESOUND).
@@ -187,13 +191,13 @@ improved drop-in replacement for the Enlightened Sound Daemon (ESOUND).
 This package contains the system libraries for clients of pulseaudio
 sound server.
 
-%package -n libpulse-mainloop-glib0
-Summary:        GLIB  2.0 Main Loop wrapper for PulseAudio
+%package -n libpulse-mainloop-glib%{soname}
+Summary:        GLIB 2.0 Main Loop wrapper for PulseAudio
 Group:          System/Sound Daemons
 Provides:       pulseaudio-libs-glib2 = %{version}
 Obsoletes:      pulseaudio-libs-glib2 < %{version}
 
-%description -n libpulse-mainloop-glib0
+%description -n libpulse-mainloop-glib%{soname}
 pulseaudio is a networked sound server for Linux and other Unix like
 operating systems and Microsoft Windows. It is intended to be an
 improved drop-in replacement for the Enlightened Sound Daemon (ESOUND).
@@ -204,8 +208,8 @@ sound server.
 %package -n libpulse-devel
 Summary:        Development package for the pulseaudio library
 Group:          Development/Libraries/C and C++
-Requires:       libpulse-mainloop-glib0 = %{version}
-Requires:       libpulse0 = %{version}
+Requires:       libpulse%{soname} = %{version}
+Requires:       libpulse-mainloop-glib%{soname} = %{version}
 Requires:       pkgconfig
 Requires:       pkgconfig(glib-2.0)
 Provides:       pulseaudio-devel = %{version}
@@ -223,8 +227,8 @@ pulseaudio library.
 Summary:        PulseAudio utilities
 Group:          System/Sound Daemons
 Requires:       %{name} = %{version}
-Requires:       libpulse-mainloop-glib0 = %{version}
-Requires:       libpulse0 = %{version}
+Requires:       libpulse%{soname} = %{version}
+Requires:       libpulse-mainloop-glib%{soname} = %{version}
 
 %description utils
 pulseaudio is a networked sound server for Linux and other Unix like
@@ -257,8 +261,7 @@ This package contains GDM integration hooks for the PulseAudio sound server.
 translation-update-upstream
 %patch0
 %patch1 -p1
-%patch2 -p1
-%patch3
+%patch2
 
 %build
 autoreconf
@@ -277,9 +280,14 @@ make doxygen
 
 %install
 %make_install
-rm -rf %{buildroot}%{_libdir}/*.la %{buildroot}%{_libdir}/pulse-%{drvver}/modules/*.la
+rm -rf \
+    "%{buildroot}%{_libdir}"/*.la \
+    "%{buildroot}%{_libdir}/pulse-%{drvver}/modules"/*.la \
+    "%{buildroot}%{_libdir}/pulseaudio"/*.la
+
 # configure --disable-static had no effect; delete manually.
-rm -rf %{buildroot}%{_libdir}/*.a
+rm -rf "%{buildroot}%{_libdir}"/*.a
+
 # openSUSE 11.3 cannot find the .desktop files
 %suse_update_desktop_file pulseaudio
 %suse_update_desktop_file pulseaudio-kde
@@ -297,7 +305,7 @@ ln -s esdcompat %{buildroot}%{_bindir}/esd
 %fdupes -s doxygen/html
 
 %clean
-rm -rf %{buildroot}
+%{?buildroot:%__rm -rf '%{buildroot}'}
 
 %pre
 groupadd -r pulse &>/dev/null || :
@@ -305,13 +313,13 @@ useradd -r -c 'PulseAudio daemon' \
     -s /sbin/nologin -d /var/lib/pulseaudio -g pulse -G audio pulse &>/dev/null || :
 groupadd -r pulse-access &>/dev/null || :
 
-%post   -n libpulse0 -p /sbin/ldconfig
+%post   -n libpulse%{soname} -p /sbin/ldconfig
 
-%postun -n libpulse0 -p /sbin/ldconfig
+%postun -n libpulse%{soname} -p /sbin/ldconfig
 
-%post   -n libpulse-mainloop-glib0 -p /sbin/ldconfig
+%post   -n libpulse-mainloop-glib%{soname} -p /sbin/ldconfig
 
-%postun -n libpulse-mainloop-glib0 -p /sbin/ldconfig
+%postun -n libpulse-mainloop-glib%{soname} -p /sbin/ldconfig
 
 %post
 /sbin/ldconfig
@@ -331,7 +339,8 @@ setup-pulseaudio --auto > /dev/null
 %{_datadir}/pulseaudio/alsa-mixer
 %{_localstatedir}/adm/fillup-templates/sysconfig.sound-pulseaudio
 %{_libdir}/libpulsecore-%{drvver}.so
-%{_libdir}/libpulsedsp.so
+%dir %{_libdir}/pulseaudio
+%{_libdir}/pulseaudio/libpulsedsp.so
 %dir %{_libdir}/pulse-%{drvver}/
 %dir %{_libdir}/pulse-%{drvver}/modules/
 %{_libdir}/pulse-%{drvver}/modules/libalsa-util.so
@@ -355,7 +364,6 @@ setup-pulseaudio --auto > /dev/null
 %{_libdir}/pulse-%{drvver}/modules/module-combine.so
 %{_libdir}/pulse-%{drvver}/modules/module-combine-sink.so
 %{_libdir}/pulse-%{drvver}/modules/module-console-kit.so
-%{_libdir}/pulse-%{drvver}/modules/module-cork-music-on-phone.so
 %{_libdir}/pulse-%{drvver}/modules/module-dbus-protocol.so
 %{_libdir}/pulse-%{drvver}/modules/module-default-device-restore.so
 %{_libdir}/pulse-%{drvver}/modules/module-detect.so
@@ -389,6 +397,7 @@ setup-pulseaudio --auto > /dev/null
 %{_libdir}/pulse-%{drvver}/modules/module-position-event-sounds.so
 %{_libdir}/pulse-%{drvver}/modules/module-remap-sink.so
 %{_libdir}/pulse-%{drvver}/modules/module-rescue-streams.so
+%{_libdir}/pulse-%{drvver}/modules/module-role-cork.so
 %{_libdir}/pulse-%{drvver}/modules/module-rtp-recv.so
 %{_libdir}/pulse-%{drvver}/modules/module-rtp-send.so
 %{_libdir}/pulse-%{drvver}/modules/module-rygel-media-server.so
@@ -399,17 +408,23 @@ setup-pulseaudio --auto > /dev/null
 %{_libdir}/pulse-%{drvver}/modules/module-stream-restore.so
 %{_libdir}/pulse-%{drvver}/modules/module-suspend-on-idle.so
 %{_libdir}/pulse-%{drvver}/modules/module-switch-on-connect.so
+%{_libdir}/pulse-%{drvver}/modules/module-switch-on-port-available.so
+%if 0%{?suse_version} >= 1210
+%{_libdir}/pulse-%{drvver}/modules/module-systemd-login.so
+%endif
 %{_libdir}/pulse-%{drvver}/modules/module-tunnel-sink.so
 %{_libdir}/pulse-%{drvver}/modules/module-tunnel-source.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
+%{_libdir}/pulse-%{drvver}/modules/module-virtual-surround-sink.so
 %{_libdir}/pulse-%{drvver}/modules/module-volume-restore.so
 /lib/udev/rules.d/90-pulseaudio.rules
-%{_mandir}/man1/pulseaudio.1.gz
-%{_mandir}/man5/default.pa.5.gz
-%{_mandir}/man5/pulse-client.conf.5.gz
-%{_mandir}/man5/pulse-daemon.conf.5.gz
+%doc %{_mandir}/man1/pulseaudio.1*
+%doc %{_mandir}/man5/default.pa.5*
+%doc %{_mandir}/man5/pulse-client.conf.5*
+%doc %{_mandir}/man5/pulse-daemon.conf.5*
+%doc %{_mandir}/man5/pulse-cli-syntax.5*
 %dir %{_sysconfdir}/pulse/
 %config(noreplace) %{_sysconfdir}/pulse/daemon.conf
 %config(noreplace) %{_sysconfdir}/pulse/default.pa
@@ -423,7 +438,7 @@ setup-pulseaudio --auto > /dev/null
 %defattr(-,root,root)
 %{_bindir}/esdcompat
 %{_bindir}/esd
-%{_mandir}/man1/esdcompat.1.gz
+%doc %{_mandir}/man1/esdcompat.1*
 
 %files gdm-hooks
 %defattr(-,root,root)
@@ -431,14 +446,16 @@ setup-pulseaudio --auto > /dev/null
 %attr(0700, gdm, gdm) %dir %{_localstatedir}/lib/gdm/.pulse
 %attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa
 
-%files -n libpulse0
+%files -n libpulse%{soname}
 %defattr(-,root,root)
 %doc README LICENSE GPL LGPL
 %dir %{_sysconfdir}/pulse/
 %config(noreplace) %{_sysconfdir}/pulse/client.conf
-%{_libdir}/libpulse.so.*
-%{_libdir}/libpulsecommon-%{drvver}.so
+%{_libdir}/libpulse.so.%{soname}
+%{_libdir}/libpulse.so.%{soname}.*
 %{_libdir}/libpulse-simple.so.*
+%dir %{_libdir}/pulseaudio
+%{_libdir}/pulseaudio/libpulsecommon-%{drvver}.so
 
 %files -n libpulse-devel
 %defattr(-,root,root)
@@ -453,9 +470,10 @@ setup-pulseaudio --auto > /dev/null
 %{_libdir}/cmake/PulseAudio/PulseAudio*.cmake
 %{_datadir}/vala
 
-%files -n libpulse-mainloop-glib0
+%files -n libpulse-mainloop-glib%{soname}
 %defattr(-,root,root)
-%{_libdir}/libpulse-mainloop-glib.so.*
+%{_libdir}/libpulse-mainloop-glib.so.%{soname}
+%{_libdir}/libpulse-mainloop-glib.so.%{soname}.*
 
 %files module-bluetooth
 %defattr(-,root,root)
@@ -493,8 +511,8 @@ setup-pulseaudio --auto > /dev/null
 %{_libdir}/pulse-%{drvver}/modules/module-x11-cork-request.so
 %{_libdir}/pulse-%{drvver}/modules/module-x11-publish.so
 %{_libdir}/pulse-%{drvver}/modules/module-x11-xsmp.so
-%{_mandir}/man1/start-pulseaudio-kde.1.gz
-%{_mandir}/man1/start-pulseaudio-x11.1.gz
+%doc %{_mandir}/man1/start-pulseaudio-kde.1*
+%doc %{_mandir}/man1/start-pulseaudio-x11.1*
 
 %files module-zeroconf
 %defattr(-,root,root)
@@ -517,13 +535,13 @@ setup-pulseaudio --auto > /dev/null
 %{_bindir}/pax11publish
 %{_bindir}/padsp
 %{_bindir}/pasuspender
-%{_mandir}/man1/pacat.1.gz
-%{_mandir}/man1/pacmd.1.gz
-%{_mandir}/man1/pactl.1.gz
-%{_mandir}/man1/paplay.1.gz
-%{_mandir}/man1/pasuspender.1.gz
-%{_mandir}/man1/padsp.1.gz
-%{_mandir}/man1/pax11publish.1.gz
+%doc %{_mandir}/man1/pacat.1*
+%doc %{_mandir}/man1/pacmd.1*
+%doc %{_mandir}/man1/pactl.1*
+%doc %{_mandir}/man1/paplay.1*
+%doc %{_mandir}/man1/pasuspender.1*
+%doc %{_mandir}/man1/padsp.1*
+%doc %{_mandir}/man1/pax11publish.1*
 
 %files lang -f %{name}.lang