diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index 1bf47fecc62..63e4c5c8168 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.44 2005/09/21 14:40:19 bernd Exp $
+# $OpenBSD: Makefile,v 1.45 2005/12/23 16:37:10 espie Exp $
 
 COMMENT=		"Multimedia player for the X Window System"
 COMMENT-esd=		"Esound output plugin for XMMS"
@@ -6,13 +6,15 @@ COMMENT-vorbis=		"Ogg Vorbis input plugin for XMMS"
 COMMENT-mikmod=		"Mikmod input plugin for XMMS"
 COMMENT-mp3=		"MP3 input plugin for XMMS"
 
-VERSION=		1.2.10p5
-DISTNAME=		xmms-${VERSION:S,p5,,}
-PKGNAME=		xmms-${VERSION}
-PKGNAME-esd=		xmms-esd-${VERSION}
-PKGNAME-vorbis=		xmms-vorbis-${VERSION}
-PKGNAME-mikmod=		xmms-mikmod-${VERSION}
-PKGNAME-mp3=		xmms-mp3-${VERSION}
+VERSION=		1.2.10
+DISTNAME=		xmms-${VERSION}
+PKGNAME=		xmms-${VERSION}p6
+PKGNAME-esd=		xmms-esd-${VERSION}p5
+PKGNAME-vorbis=		xmms-vorbis-${VERSION}p5
+PKGNAME-mikmod=		xmms-mikmod-${VERSION}p5
+PKGNAME-mp3=		xmms-mp3-${VERSION}p5
+SHARED_LIBS=		xmms	4.1
+MODGNU_SHARED_LIBS=	xmms	'-export-dynamic'
 CATEGORIES=		audio
 HOMEPAGE=		http://www.xmms.org
 
diff --git a/audio/xmms/pkg/PFRAG.shared b/audio/xmms/pkg/PFRAG.shared
index abcda6682c8..3262d2da7da 100644
--- a/audio/xmms/pkg/PFRAG.shared
+++ b/audio/xmms/pkg/PFRAG.shared
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PFRAG.shared,v 1.12 2004/09/14 23:16:56 espie Exp $
-@lib lib/libxmms.so.4.1
+@comment $OpenBSD: PFRAG.shared,v 1.13 2005/12/23 16:37:10 espie Exp $
+@lib lib/libxmms.so.${LIBxmms_VERSION}
 lib/xmms/
 lib/xmms/Effect/
 lib/xmms/Effect/libecho.so
diff --git a/audio/xmms/pkg/PLIST b/audio/xmms/pkg/PLIST
index 6535841ec65..58b0c6a33f7 100644
--- a/audio/xmms/pkg/PLIST
+++ b/audio/xmms/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2004/09/14 23:16:56 espie Exp $
+@comment $OpenBSD: PLIST,v 1.9 2005/12/23 16:37:10 espie Exp $
 bin/wmxmms
 bin/xmms
 bin/xmms-config
@@ -44,15 +44,11 @@ share/locale/af/LC_MESSAGES/xmms.mo
 share/locale/az/
 share/locale/az/LC_MESSAGES/
 share/locale/az/LC_MESSAGES/xmms.mo
-share/locale/be/
-share/locale/be/LC_MESSAGES/
 share/locale/be/LC_MESSAGES/xmms.mo
 share/locale/bg/LC_MESSAGES/xmms.mo
 share/locale/bs/
 share/locale/bs/LC_MESSAGES/
 share/locale/bs/LC_MESSAGES/xmms.mo
-share/locale/ca/
-share/locale/ca/LC_MESSAGES/
 share/locale/ca/LC_MESSAGES/xmms.mo
 share/locale/cs/LC_MESSAGES/xmms.mo
 share/locale/cy/
@@ -70,8 +66,6 @@ share/locale/eu/LC_MESSAGES/
 share/locale/eu/LC_MESSAGES/xmms.mo
 share/locale/fi/LC_MESSAGES/xmms.mo
 share/locale/fr/LC_MESSAGES/xmms.mo
-share/locale/ga/
-share/locale/ga/LC_MESSAGES/
 share/locale/ga/LC_MESSAGES/xmms.mo
 share/locale/gl/LC_MESSAGES/xmms.mo
 share/locale/hr/LC_MESSAGES/xmms.mo
@@ -106,8 +100,6 @@ share/locale/sl/LC_MESSAGES/xmms.mo
 share/locale/sq/
 share/locale/sq/LC_MESSAGES/
 share/locale/sq/LC_MESSAGES/xmms.mo
-share/locale/sr/
-share/locale/sr/LC_MESSAGES/
 share/locale/sr/LC_MESSAGES/xmms.mo
 share/locale/sr@Latn/
 share/locale/sr@Latn/LC_MESSAGES/
@@ -124,8 +116,6 @@ share/locale/uk/LC_MESSAGES/xmms.mo
 share/locale/uz/
 share/locale/uz/LC_MESSAGES/
 share/locale/uz/LC_MESSAGES/xmms.mo
-share/locale/vi/
-share/locale/vi/LC_MESSAGES/
 share/locale/vi/LC_MESSAGES/xmms.mo
 share/locale/wa/
 share/locale/wa/LC_MESSAGES/