diff --git a/pulseaudio.changes b/pulseaudio.changes
index 731e3bd..c3fedd2 100644
--- a/pulseaudio.changes
+++ b/pulseaudio.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Jan  8 17:48:35 CET 2008 - rodrigo@suse.de
+
+- Don't remove users/groups on %postun 
+
+-------------------------------------------------------------------
+Tue Jan  8 15:41:10 CET 2008 - rodrigo@suse.de
+
+- Removed 'rm -rf $RPM_BUILD_ROOT' from %install
+
 -------------------------------------------------------------------
 Mon Dec 24 12:13:36 CET 2007 - rodrigo@suse.de
 
diff --git a/pulseaudio.spec b/pulseaudio.spec
index b4b7107..54b895f 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package pulseaudio (Version 0.9.7)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -14,7 +14,7 @@ Name:           pulseaudio
 %define drvver 0.9
 Summary:        A Networked Sound Server
 Version:        0.9.7
-Release:        15
+Release:        16
 License:        GPL v2 or later; LGPL v2.1 or later
 Group:          System/Sound Daemons
 #Source0:	http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
@@ -253,7 +253,6 @@ make LIBTOOL=/usr/bin/libtool
 make doxygen
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pulse/
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/pulse-%{drvver}/modules/*.la
@@ -275,14 +274,7 @@ groupadd -r pulse-access &>/dev/null || :
 
 %post -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
-if [ $1 -eq 0 ]; then
-    userdel pulse &>/dev/null || :
-    groupdel pulse &>/dev/null || :
-    groupdel pulse-rt &>/dev/null || :
-    groupdel pulse-access &>/dev/null || :
-fi
+%postun -p /sbin/ldconfig
 
 %post libs -p /sbin/ldconfig
 
@@ -446,6 +438,10 @@ fi
 %{_libdir}/libpulsedsp.so
 
 %changelog
+* Tue Jan 08 2008 - rodrigo@suse.de
+- Don't remove users/groups on %%postun
+* Tue Jan 08 2008 - rodrigo@suse.de
+- Removed 'rm -rf $RPM_BUILD_ROOT' from %%install
 * Mon Dec 24 2007 - rodrigo@suse.de
 - Use /var/lib/pulseaudio as home dir for pulseaudio user.
 * Tue Dec 11 2007 - rodrigo@suse.de