diff --git a/audio/linux-f10-pulseaudio-libs/Makefile b/audio/linux-f10-pulseaudio-libs/Makefile
index 050be32b258d..fc7c74f4a7b0 100644
--- a/audio/linux-f10-pulseaudio-libs/Makefile
+++ b/audio/linux-f10-pulseaudio-libs/Makefile
@@ -1,28 +1,28 @@
 # Created by: avg
 # $FreeBSD$
 
 PORTNAME=	pulseaudio-libs
 PORTVERSION=	0.9.14
 CATEGORIES=	audio linux
 MASTER_SITES=	LOCAL
 MASTER_SITE_SUBDIR=	netchild/rpms/${LINUX_DIST}${LINUX_DIST_VER}
 
 MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	Libraries for PulseAudio clients
+COMMENT=	Libraries for PulseAudio clients (Linux Fedora 10)
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX=	f10
 USE_LINUX_RPM=	yes
+USE_LINUX_APPS=	libasyncns xorglibs
 
 RPMVERSION=	4.fc10
 SRC_DISTFILES=	${PORTNAME:S/-libs//}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}
 USE_LDCONFIG=	yes
 
-CONF_FILE=	etc/pulse/client.conf
-
 pre-patch:
-	@${MV} ${WRKSRC}/${CONF_FILE} ${WRKSRC}/${CONF_FILE}-dist
+	@(cd ${WRKSRC}/etc/pulse && ${MV} client.conf client.conf.sample)
+
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
 
 .include <bsd.port.mk>
diff --git a/audio/linux-f10-pulseaudio-libs/files/patch-etc_pulse_client.conf-dist b/audio/linux-f10-pulseaudio-libs/files/patch-etc_pulse_client.conf.sample
similarity index 69%
rename from audio/linux-f10-pulseaudio-libs/files/patch-etc_pulse_client.conf-dist
rename to audio/linux-f10-pulseaudio-libs/files/patch-etc_pulse_client.conf.sample
index 1ac209b0fa49..6271d209888e 100644
--- a/audio/linux-f10-pulseaudio-libs/files/patch-etc_pulse_client.conf-dist
+++ b/audio/linux-f10-pulseaudio-libs/files/patch-etc_pulse_client.conf.sample
@@ -1,16 +1,16 @@
---- etc/pulse/client.conf-dist.orig	2011-04-01 15:42:58.548733177 +0300
-+++ etc/pulse/client.conf-dist	2011-04-01 15:53:03.306719164 +0300
+--- etc/pulse/client.conf.sample.orig	2011-04-01 15:42:58.548733177 +0300
++++ etc/pulse/client.conf.sample	2011-04-01 15:53:03.306719164 +0300
 @@ -23,11 +23,11 @@
  ; default-source =
  ; default-server =
  
 -; autospawn = yes
 +autospawn = no
  ; daemon-binary = /usr/bin/pulseaudio
  ; extra-arguments = --log-target=syslog
  
  ; cookie-file =
  
 -; disable-shm = no
 +disable-shm = yes
  ; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
diff --git a/audio/linux-f10-pulseaudio-libs/pkg-plist b/audio/linux-f10-pulseaudio-libs/pkg-plist
index 8c7b66fa1128..e91b591ffa9a 100644
--- a/audio/linux-f10-pulseaudio-libs/pkg-plist
+++ b/audio/linux-f10-pulseaudio-libs/pkg-plist
@@ -1,15 +1,13 @@
-@unexec if cmp -s %D/etc/pulse/client.conf-dist %D/etc/pulse/client.conf; then rm -f %D/etc/pulse/client.conf; fi
-etc/pulse/client.conf-dist
-@exec if [ ! -f %D/etc/pulse/client.conf ] ; then cp -p %D/%F %B/client.conf; fi
+@sample etc/pulse/client.conf.sample
 usr/lib/libpulse-simple.so.0
 usr/lib/libpulse-simple.so.0.0.2
 usr/lib/libpulse.so.0
 usr/lib/libpulse.so.0.7.1
 usr/share/doc/pulseaudio-libs-0.9.14/GPL
 usr/share/doc/pulseaudio-libs-0.9.14/LGPL
 usr/share/doc/pulseaudio-libs-0.9.14/LICENSE
 usr/share/doc/pulseaudio-libs-0.9.14/README
 usr/share/locale/de/LC_MESSAGES/pulseaudio.mo
 usr/share/locale/el/LC_MESSAGES/pulseaudio.mo
 usr/share/locale/fr/LC_MESSAGES/pulseaudio.mo
 usr/share/locale/sv/LC_MESSAGES/pulseaudio.mo