diff --git a/audio/audacious-plugins/Makefile b/audio/audacious-plugins/Makefile
index 3aa2f8a75a8..92c3be865d7 100644
--- a/audio/audacious-plugins/Makefile
+++ b/audio/audacious-plugins/Makefile
@@ -1,15 +1,13 @@
-# $OpenBSD: Makefile,v 1.48 2012/05/22 18:39:42 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.49 2012/06/08 14:44:55 dcoppa Exp $
 
 SHARED_ONLY =		Yes
 
 COMMENT =		input and output plugins for audacious
 
-V =			3.2.2
+V =			3.2.3
 
 DISTNAME =		audacious-plugins-$V
 
-REVISION =		1
-
 CATEGORIES =		audio multimedia
 
 HOMEPAGE =		http://audacious-media-player.org/
@@ -62,7 +60,7 @@ LIB_DEPENDS =		audio/faad>=2.7 \
 USE_GMAKE =		Yes
 
 CONFIGURE_STYLE =	autoconf
-AUTOCONF_VERSION =	2.68
+AUTOCONF_VERSION =	2.69
 CONFIGURE_ARGS +=	--enable-ipv6 \
 			--disable-pulse \
 			--disable-adplug \
diff --git a/audio/audacious-plugins/distinfo b/audio/audacious-plugins/distinfo
index 70bc0beb164..8dbbb24bef0 100644
--- a/audio/audacious-plugins/distinfo
+++ b/audio/audacious-plugins/distinfo
@@ -1,5 +1,5 @@
-MD5 (audacious-plugins-3.2.2.tar.bz2) = eq+K04mimDut291XIH4HJA==
-RMD160 (audacious-plugins-3.2.2.tar.bz2) = dsAnF3ggEk4+/sbq74fcWq1pkeo=
-SHA1 (audacious-plugins-3.2.2.tar.bz2) = RRim/cugwbSW4Ei0XOXYekYybJs=
-SHA256 (audacious-plugins-3.2.2.tar.bz2) = xjfmdw7UHsDohfIQlEI0MmCQ2c7PBUfiVF//Cbwlt/w=
-SIZE (audacious-plugins-3.2.2.tar.bz2) = 1898457
+MD5 (audacious-plugins-3.2.3.tar.bz2) = lkVjf7EI9NXMR+ctGUxVdA==
+RMD160 (audacious-plugins-3.2.3.tar.bz2) = I4drCnyRdEj9VZfVbzEqiZQvw38=
+SHA1 (audacious-plugins-3.2.3.tar.bz2) = h6eVxOz2Ra02/+e7OntWkeAxb3E=
+SHA256 (audacious-plugins-3.2.3.tar.bz2) = u6cPu7T6fR9A3k2WJlBptvryMjPL9UTLKIL3xwnJ0to=
+SIZE (audacious-plugins-3.2.3.tar.bz2) = 1921236
diff --git a/audio/audacious-plugins/patches/patch-configure_ac b/audio/audacious-plugins/patches/patch-configure_ac
index 49cab463248..92bf0aeb6b9 100644
--- a/audio/audacious-plugins/patches/patch-configure_ac
+++ b/audio/audacious-plugins/patches/patch-configure_ac
@@ -1,6 +1,6 @@
-$OpenBSD: patch-configure_ac,v 1.12 2012/05/11 11:59:31 dcoppa Exp $
---- configure.ac.orig	Fri Jan 20 14:48:30 2012
-+++ configure.ac	Fri May 11 01:11:01 2012
+$OpenBSD: patch-configure_ac,v 1.13 2012/06/08 14:44:55 dcoppa Exp $
+--- configure.ac.orig	Sat May 26 13:43:44 2012
++++ configure.ac	Fri Jun  8 11:00:09 2012
 @@ -41,9 +41,6 @@ PKG_CHECK_MODULES(AUDACIOUS, [audacious >= 3.2],
      [AC_MSG_ERROR([Cannot find Audacious 3.2; have you installed Audacious yet?])]
  )
@@ -20,7 +20,7 @@ $OpenBSD: patch-configure_ac,v 1.12 2012/05/11 11:59:31 dcoppa Exp $
    [AC_CHECK_LIB(pthreads, pthread_create, PTHREAD_LIBS="-lpthreads",
  	[AC_CHECK_LIB(pthreadGC2, pthread_create, PTHREAD_LIBS="-lpthreadGC2")]
    )]
-@@ -969,7 +966,7 @@ AC_ARG_ENABLE(filewriter_mp3,
+@@ -963,7 +960,7 @@ AC_ARG_ENABLE(filewriter_mp3,
  )
  
  if test "x$enable_filewriter_mp3" = "xyes"; then
@@ -29,7 +29,7 @@ $OpenBSD: patch-configure_ac,v 1.12 2012/05/11 11:59:31 dcoppa Exp $
     if test "x$have_lame" = "xyes"; then
        AC_DEFINE(FILEWRITER_MP3, 1, [Define if MP3 output part should be built])
  	  FILEWRITER_LIBS="$FILEWRITER_LIBS -lmp3lame"
-@@ -1092,8 +1089,32 @@ if test "x$enable_lyricwiki" = "xyes"; then
+@@ -1077,8 +1074,32 @@ if test "x$enable_lyricwiki" = "xyes"; then
      GENERAL_PLUGINS="$GENERAL_PLUGINS lyricwiki"
  fi
  
@@ -62,7 +62,7 @@ $OpenBSD: patch-configure_ac,v 1.12 2012/05/11 11:59:31 dcoppa Exp $
  plugindir=`pkg-config audacious --variable=plugin_dir`
  AC_SUBST(plugindir)
  
-@@ -1163,6 +1184,7 @@ echo "    -> FileWriter Vorbis output part:     $have_
+@@ -1148,6 +1169,7 @@ echo "    -> FileWriter Vorbis output part:     $enabl
  echo "    -> FileWriter FLAC output part:       $have_writer_flac"
  echo "  Null Audio output (null):               yes"
  echo "  Open Sound System v3 (deprecated):      $enable_oss"
diff --git a/audio/audacious-plugins/patches/patch-extra_mk_in b/audio/audacious-plugins/patches/patch-extra_mk_in
index f03a3e9b6ab..315ace5fd44 100644
--- a/audio/audacious-plugins/patches/patch-extra_mk_in
+++ b/audio/audacious-plugins/patches/patch-extra_mk_in
@@ -1,11 +1,11 @@
-$OpenBSD: patch-extra_mk_in,v 1.1 2012/05/11 11:59:31 dcoppa Exp $
---- extra.mk.in.orig	Fri May 11 01:15:04 2012
-+++ extra.mk.in	Fri May 11 01:15:25 2012
-@@ -100,6 +100,7 @@ SIDPLAY2_CFLAGS ?= @SIDPLAY2_CFLAGS@
+$OpenBSD: patch-extra_mk_in,v 1.2 2012/06/08 14:44:55 dcoppa Exp $
+--- extra.mk.in.orig	Fri Jun  8 11:01:45 2012
++++ extra.mk.in	Fri Jun  8 11:02:43 2012
+@@ -94,6 +94,7 @@ SIDPLAY2_CFLAGS ?= @SIDPLAY2_CFLAGS@
  SIDPLAY2_LIBS ?= @SIDPLAY2_LIBS@
  SNDFILE_CFLAGS ?= @SNDFILE_CFLAGS@
  SNDFILE_LIBS ?= @SNDFILE_LIBS@
 +SNDIO_LIBS ?= @SNDIO_LIBS@
+ VORBIS_CFLAGS ?= @VORBIS_CFLAGS@
+ VORBIS_LIBS ?= @VORBIS_LIBS@
  WAVPACK_CFLAGS ?= @WAVPACK_CFLAGS@
- WAVPACK_LIBS ?= @WAVPACK_LIBS@
- XCOMPOSITE_CFLAGS ?= @XCOMPOSITE_CFLAGS@
diff --git a/audio/audacious/Makefile b/audio/audacious/Makefile
index 5752f88b88a..e70098456e7 100644
--- a/audio/audacious/Makefile
+++ b/audio/audacious/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.34 2012/05/11 09:57:29 stsp Exp $
+# $OpenBSD: Makefile,v 1.35 2012/06/08 14:44:55 dcoppa Exp $
 
 SHARED_ONLY =		Yes
 
 COMMENT =		gtk+3 media player based on BMP and XMMS
 
-DISTNAME =		audacious-3.2.2
+DISTNAME =		audacious-3.2.3
 
 SHARED_LIBS =		audclient	2.1 	# 2.1
 SHARED_LIBS +=		audcore		1.1 	# 1.1
@@ -52,7 +52,7 @@ MAKE_ENV =		LIBaudclient_VERSION=${LIBaudclient_VERSION} \
 USE_GMAKE =		Yes
 
 CONFIGURE_STYLE =	autoconf
-AUTOCONF_VERSION =	2.68
+AUTOCONF_VERSION =	2.69
 
 NO_REGRESS =	Yes
 
diff --git a/audio/audacious/distinfo b/audio/audacious/distinfo
index ef3541029f4..3b81c995363 100644
--- a/audio/audacious/distinfo
+++ b/audio/audacious/distinfo
@@ -1,5 +1,5 @@
-MD5 (audacious-3.2.2.tar.bz2) = KPHixoPTWEV+2b/ovMKewg==
-RMD160 (audacious-3.2.2.tar.bz2) = H2omhhNFXwe9IJ8EiKoPLbr3tbQ=
-SHA1 (audacious-3.2.2.tar.bz2) = UNLvCNPdSMLvsZSp/fIW+k+K/SQ=
-SHA256 (audacious-3.2.2.tar.bz2) = xpwg5Iwu0zCg/7VfOmSLUDI0BuKhXKQH4ykfg+VwQu4=
-SIZE (audacious-3.2.2.tar.bz2) = 675192
+MD5 (audacious-3.2.3.tar.bz2) = Mi2SgRaLkuPvTpM05qLV8w==
+RMD160 (audacious-3.2.3.tar.bz2) = 4ptC3wgTjtHk/Lq4Mkv3aDxOJtw=
+SHA1 (audacious-3.2.3.tar.bz2) = I74Pywp9XsK8TU/uQ2538hOJA+8=
+SHA256 (audacious-3.2.3.tar.bz2) = rqitL02oD7WM+LDogFhatJrELooCJHw2TqKczKVXK64=
+SIZE (audacious-3.2.3.tar.bz2) = 695917