diff --git a/net/gaim/Makefile b/net/gaim/Makefile
index 6c782cbc586..15dc4e4e1c8 100644
--- a/net/gaim/Makefile
+++ b/net/gaim/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.99 2007/02/01 07:58:29 todd Exp $
+# $OpenBSD: Makefile,v 1.100 2007/02/07 01:07:18 todd Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	"Gtk AIM, ICQ, IRC, Jabber, MSN, Yahoo, SILC and Zephyr client"
 
 DISTNAME=	gaim-2.0.0beta6
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 SHARED_LIBS=	gaim 0.0 \
 		gaim-client 0.0 \
 		gnt 0.0 \
@@ -33,7 +33,11 @@ MODULES=	devel/gettext
 
 PYTHON_VER=	2.4
 
-BUILD_DEPENDS+=	:python-${PYTHON_VER}*:lang/python/${PYTHON_VER}
+BUILD_DEPENDS+=	:python-${PYTHON_VER}*:lang/python/${PYTHON_VER} \
+		:p5-XML-Parser-*:textproc/p5-XML-Parser
+RUN_DEPENDS+=	:python-${PYTHON_VER}*:lang/python/${PYTHON_VER} \
+		:dbus-python-*:x11/dbus-python \
+		:py-gtk2-*:x11/py-gtk2
 LIB_DEPENDS+=	gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
 		startup-notification-1::devel/startup-notification \
 		silc,silcclient::devel/silc-toolkit \
@@ -42,8 +46,6 @@ LIB_DEPENDS+=	gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
 		xml2::textproc/libxml \
 		dbus-glib-1::x11/dbus-glib
 
-BUILD_DEPENDS+=	:p5-XML-Parser-*:textproc/p5-XML-Parser
-
 USE_X11=	Yes
 USE_LIBTOOL=	Yes
 LIBTOOL_FLAGS+=	--tag=disable-static
@@ -53,7 +55,6 @@ CONFIGURE_STYLE= autoconf
 AUTOCONF_VERSION= 2.59
 CONFIGURE_ARGS+= --disable-gevolution \
 		 --disable-gnutls \
-		 --disable-gstreamer \
 		 --disable-nas \
 		 --disable-nss \
 		 --disable-perl \
@@ -61,19 +62,26 @@ CONFIGURE_ARGS+= --disable-gevolution \
 		 --disable-tk \
 		 --disable-cap \
 		 --disable-schemas-install \
-		 --disable-audio \
 		 --enable-openssl \
 		 --enable-consoleui \
 		 --with-python=${LOCALBASE}/bin/python${PYTHON_VER}
-# --disable-gstreamer is not sufficient
-MAKE_FLAGS+=	GSTREAMER_CFLAGS= GSTREAMER_LIBS=
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-FLAVORS=	debug gtkspell
+FLAVORS=	audio debug gtkspell
 FLAVOR?=	
 
+
+.if ${FLAVOR:L:Maudio}
+LIB_DEPENDS+=		gstreamer-0.10:gstreamer-0.10.*:multimedia/gstreamer-0.10/core
+.else
+CONFIGURE_ARGS+=	--disable-audio \
+			--disable-gstreamer
+# --disable-gstreamer is not sufficient
+MAKE_FLAGS+=    GSTREAMER_CFLAGS= GSTREAMER_LIBS=
+.endif
+
 .if ${FLAVOR:L:Mdebug}
 CFLAGS=		-O0
 CONFIGURE_ARGS+=--enable-debug
@@ -88,7 +96,15 @@ WANTLIB+=	aspell
 CONFIGURE_ARGS+=--disable-gtkspell
 .endif
 
+PYTHON_SCRIPTS=	gaim-notifications-example gaim-remote gaim-url-handler
+
 post-extract:
 	@cp -f ${FILESDIR}/ssl-openssl.c ${WRKSRC}/libgaim/plugins/ssl
 
+post-install:
+.for f in ${PYTHON_SCRIPTS}
+	@perl -pi -e 's#%python%#${LOCALBASE}/bin/python${PYTHON_VER}#g' \
+	    ${PREFIX}/bin/${f}
+.endfor
+
 .include <bsd.port.mk>
diff --git a/net/gaim/patches/patch-libgaim_gaim-notifications-example b/net/gaim/patches/patch-libgaim_gaim-notifications-example
new file mode 100644
index 00000000000..75994252dd5
--- /dev/null
+++ b/net/gaim/patches/patch-libgaim_gaim-notifications-example
@@ -0,0 +1,9 @@
+$OpenBSD: patch-libgaim_gaim-notifications-example,v 1.1 2007/02/07 01:07:18 todd Exp $
+--- libgaim/gaim-notifications-example.orig	Fri Feb  2 17:19:53 2007
++++ libgaim/gaim-notifications-example	Fri Feb  2 17:23:16 2007
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!%python%
+ 
+ # This is a simple gaim notification server.
+ # It shows notifications when your buddy signs on or you get an IM message.
diff --git a/net/gaim/patches/patch-libgaim_gaim-remote b/net/gaim/patches/patch-libgaim_gaim-remote
new file mode 100644
index 00000000000..5a12c1afacf
--- /dev/null
+++ b/net/gaim/patches/patch-libgaim_gaim-remote
@@ -0,0 +1,9 @@
+$OpenBSD: patch-libgaim_gaim-remote,v 1.1 2007/02/07 01:07:18 todd Exp $
+--- libgaim/gaim-remote.orig	Fri Feb  2 17:22:36 2007
++++ libgaim/gaim-remote	Fri Feb  2 17:22:59 2007
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!%python%
+ 
+ import dbus
+ import re
diff --git a/net/gaim/patches/patch-libgaim_gaim-url-handler b/net/gaim/patches/patch-libgaim_gaim-url-handler
new file mode 100644
index 00000000000..de155303035
--- /dev/null
+++ b/net/gaim/patches/patch-libgaim_gaim-url-handler
@@ -0,0 +1,9 @@
+$OpenBSD: patch-libgaim_gaim-url-handler,v 1.1 2007/02/07 01:07:18 todd Exp $
+--- libgaim/gaim-url-handler.orig	Fri Feb  2 17:18:14 2007
++++ libgaim/gaim-url-handler	Fri Feb  2 17:19:23 2007
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!%python%
+ 
+ import dbus
+ import re