diff --git a/audio/faad/Makefile b/audio/faad/Makefile
index 612da8fa939..2a2d6dfded2 100644
--- a/audio/faad/Makefile
+++ b/audio/faad/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.35 2007/12/11 11:00:37 jakemsr Exp $
+# $OpenBSD: Makefile,v 1.36 2008/01/14 01:16:37 jakemsr Exp $
 
 COMMENT-main=	MPEG2 and MPEG-4 AAC decoder
 COMMENT-xmms=	XMMS input plugin for AAC files
 DISTNAME=	faad2-2.0
 PKGNAME-main=	faad-2.0p6
-PKGNAME-xmms=	faad-xmms-2.0p6
+PKGNAME-xmms=	faad-xmms-2.0p7
 CATEGORIES=    	audio
 MASTER_SITES=	http://mirrors.protection.cx/~jolan/
 SHARED_LIBS +=	faad                 1.0      # .0.0
@@ -51,7 +51,7 @@ LIB_DEPENDS-xmms=	xmms.>=3::audio/xmms \
 RUN_DEPENDS-xmms=	::audio/xmms
 WANTLIB-xmms=		${WANTLIB} \
 			X11 Xau Xdmcp Xext Xi iconv intl glib \
-			gmodule gthread gtk gdk
+			gmodule gtk gdk
 WANTLIB-main=		${WANTLIB} c
 
 
diff --git a/audio/xmms-shn/Makefile b/audio/xmms-shn/Makefile
index be51c137cac..9ff73e6bd7a 100644
--- a/audio/xmms-shn/Makefile
+++ b/audio/xmms-shn/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.23 2007/09/15 21:26:03 simon Exp $
+# $OpenBSD: Makefile,v 1.24 2008/01/14 01:16:37 jakemsr Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	XMMS input plugin for playing shorten files
 
 DISTNAME=	xmms-shn-2.4.1
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	audio
 HOMEPAGE=	http://www.etree.org/shnutils/xmms-shn/
 
@@ -17,11 +17,10 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		X11 Xau Xdmcp Xext Xi gdk glib gmodule gtk iconv \
-			intl m pthread
+			intl m
 
 MASTER_SITES=	${HOMEPAGE}dist/src/
 
-LIB_DEPENDS=	gthread.>=1.2::devel/glib
 RUN_DEPENDS=	::audio/xmms
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
diff --git a/audio/xmms-shn/patches/patch-configure b/audio/xmms-shn/patches/patch-configure
new file mode 100644
index 00000000000..2628aabe61e
--- /dev/null
+++ b/audio/xmms-shn/patches/patch-configure
@@ -0,0 +1,12 @@
+$OpenBSD: patch-configure,v 1.5 2008/01/14 01:16:37 jakemsr Exp $
+--- configure.orig	Fri Dec 28 21:33:34 2007
++++ configure	Fri Dec 28 21:34:21 2007
+@@ -11102,7 +11102,7 @@ else
+ fi
+ 
+ 
+-  for module in . gthread
++  for module in .
+   do
+       case "$module" in
+          gthread)
diff --git a/audio/xmms-sid/Makefile b/audio/xmms-sid/Makefile
index be9f2ea970a..3b3e55ab215 100644
--- a/audio/xmms-sid/Makefile
+++ b/audio/xmms-sid/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2007/09/15 21:26:03 simon Exp $
+# $OpenBSD: Makefile,v 1.12 2008/01/14 01:16:37 jakemsr Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	XMMS input plugin for playing SID files
 
 DISTNAME=	xmms-sid-0.7.4
-PKGNAME=	${DISTNAME}p2
+PKGNAME=	${DISTNAME}p3
 CATEGORIES=	audio
 HOMEPAGE=	http://www.tnsp.org/xmms-sid.php
 
@@ -16,8 +16,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		X11 Xau Xdmcp Xext Xi gdk glib gmodule gthread gtk \
-			iconv intl m pthread stdc++
+WANTLIB=		X11 Xau Xdmcp Xext Xi gdk glib gmodule gtk \
+			iconv intl m stdc++
 
 MASTER_SITES=	http://www.tnsp.org/xs-files/
 
diff --git a/audio/xmms-sid/patches/patch-configure b/audio/xmms-sid/patches/patch-configure
index 52b30e8f323..55dbfa17fb6 100644
--- a/audio/xmms-sid/patches/patch-configure
+++ b/audio/xmms-sid/patches/patch-configure
@@ -1,6 +1,6 @@
-$OpenBSD: patch-configure,v 1.3 2002/09/14 21:05:17 naddy Exp $
---- configure.orig	Sat Sep 14 22:51:11 2002
-+++ configure	Sat Sep 14 22:51:56 2002
+$OpenBSD: patch-configure,v 1.4 2008/01/14 01:16:37 jakemsr Exp $
+--- configure.orig	Mon Sep  2 14:17:33 2002
++++ configure	Fri Dec 28 21:41:33 2007
 @@ -3473,7 +3473,7 @@ else
      hardcode_direct=yes
      hardcode_shlibpath_var=no
@@ -19,3 +19,12 @@ $OpenBSD: patch-configure,v 1.3 2002/09/14 21:05:17 naddy Exp $
          hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
          ;;
        esac
+@@ -6647,7 +6647,7 @@ else
+ fi
+ 
+ 
+-  for module in . gthread
++  for module in .
+   do
+       case "$module" in
+          gthread) 
diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index bae7471eb4a..fde8819b13e 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.57 2007/12/30 20:23:15 naddy Exp $
+# $OpenBSD: Makefile,v 1.58 2008/01/14 01:16:37 jakemsr Exp $
 
 COMMENT-main=		Multimedia player for the X Window System
 COMMENT-esd=		Esound output plugin for XMMS
@@ -10,7 +10,7 @@ SHARED_ONLY=		Yes
 
 VERSION=		1.2.11
 DISTNAME=		xmms-${VERSION}
-PKGNAME-main=		xmms-${VERSION}p0
+PKGNAME-main=		xmms-${VERSION}p1
 PKGNAME-esd=		xmms-esd-${VERSION}p0
 PKGNAME-vorbis=		xmms-vorbis-${VERSION}p0
 PKGNAME-mikmod=		xmms-mikmod-${VERSION}p0
diff --git a/audio/xmms/patches/patch-libxmms_configure_in b/audio/xmms/patches/patch-libxmms_configure_in
new file mode 100644
index 00000000000..d899b0b5ada
--- /dev/null
+++ b/audio/xmms/patches/patch-libxmms_configure_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-libxmms_configure_in,v 1.8 2008/01/14 01:16:37 jakemsr Exp $
+--- libxmms/configure.in.orig	Wed Dec 19 15:37:29 2007
++++ libxmms/configure.in	Wed Dec 19 15:37:53 2007
+@@ -32,7 +32,7 @@ AC_C_BIGENDIAN
+ XMMS_FUNC_POSIX([sched_setscheduler nanosleep])
+ 
+ AM_PATH_GLIB([1.2.2],,[AC_MSG_ERROR([*** GLIB >= 1.2.2 not installed - please install first ***])])
+-AM_PATH_GTK([1.2.2],,[AC_MSG_ERROR([*** GTK+ >= 1.2.2 not installed - please install first ***])],[gthread])
++AM_PATH_GTK([1.2.2],,[AC_MSG_ERROR([*** GTK+ >= 1.2.2 not installed - please install first ***])])
+ 
+ if test -n "$GCC"
+ then