diff --git a/audio/audacious/Makefile b/audio/audacious/Makefile
index 5b0aa6f25b2..894fbe3dc69 100644
--- a/audio/audacious/Makefile
+++ b/audio/audacious/Makefile
@@ -1,16 +1,15 @@
-# $OpenBSD: Makefile,v 1.31 2011/12/03 18:55:28 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.32 2012/03/20 19:10:18 stsp Exp $
 
 SHARED_ONLY =		Yes
 
-COMMENT =		gtk+2 media player based on BMP and XMMS
+COMMENT =		gtk+3 media player based on BMP and XMMS
 
-DISTNAME =		audacious-2.4.5
-REVISION =		2
+DISTNAME =		audacious-3.2
 
-SHARED_LIBS =		audclient	1.1 	# 2.0
-SHARED_LIBS +=		audcore		0.0 	# 1.0
-SHARED_LIBS +=		audgui		0.0	# 1.0
-SHARED_LIBS +=		audtag		0.0	# 1.0
+SHARED_LIBS =		audclient	2.0 	# 2.0
+SHARED_LIBS +=		audcore		1.0 	# 1.0
+SHARED_LIBS +=		audgui		1.0	# 1.0
+SHARED_LIBS +=		audtag		1.0	# 1.0
 
 CATEGORIES =		audio multimedia
 
@@ -24,16 +23,16 @@ PERMIT_PACKAGE_FTP =	Yes
 
 WANTLIB += GL ICE SM X11 Xcomposite Xcursor Xdamage
 WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0
-WANTLIB += c cairo dbus-1>=6 dbus-glib-1 execinfo expat fontconfig
-WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 guess
-WANTLIB += m mcs mowgli pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += c cairo cairo-gobject dbus-1>=6 dbus-glib-1 execinfo expat
+WANTLIB += fontconfig freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gtk-3
+WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0
+WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pixman-1 png pthread pthread-stubs xcb xcb-render xcb-shm
 WANTLIB += z
 
-MASTER_SITES =		http://distfiles.atheme.org/
+MASTER_SITES =		http://distfiles.audacious-media-player.org/
 
-EXTRACT_SUFX =		.tgz
+EXTRACT_SUFX =		.tar.bz2
 
 MODULES =		devel/gettext
 
@@ -43,10 +42,9 @@ RUN_DEPENDS =		devel/desktop-file-utils \
 LIB_DEPENDS =		devel/libexecinfo \
 			devel/libguess \
 			devel/mcs>=0.7.0 \
-			devel/mowgli>=0.4.0 \
 			x11/dbus-glib \
 			x11/dbus \
-			x11/gtk+2
+			x11/gtk+3
 
 MAKE_ENV =		LIBaudclient_VERSION=${LIBaudclient_VERSION} \
 			LIBaudcore_VERSION=${LIBaudcore_VERSION} \
diff --git a/audio/audacious/distinfo b/audio/audacious/distinfo
index 48779004a82..8bbccd361d1 100644
--- a/audio/audacious/distinfo
+++ b/audio/audacious/distinfo
@@ -1,5 +1,5 @@
-MD5 (audacious-2.4.5.tgz) = +8yw7IfY0sRbJAyWiOBVQA==
-RMD160 (audacious-2.4.5.tgz) = npT/4mqx+wUz7I8j9mGgZGTeDbg=
-SHA1 (audacious-2.4.5.tgz) = XtwdeBRbDisGLxq7pWwLCED3VG4=
-SHA256 (audacious-2.4.5.tgz) = JIl+GtbtEwd2Mo7gMO1AZnux4c5paHr6Im5QTHJIoXA=
-SIZE (audacious-2.4.5.tgz) = 1347079
+MD5 (audacious-3.2.tar.bz2) = 6Wj+txKiKeK+AxWoVdHJbQ==
+RMD160 (audacious-3.2.tar.bz2) = JfBU7g6xG7dNO4/ncDjqQ4+T5gQ=
+SHA1 (audacious-3.2.tar.bz2) = PrxNzc9dqWC6QAB4Aj4WfgIQXoQ=
+SHA256 (audacious-3.2.tar.bz2) = 8Y0qKOjl/wbRUozb174R/B5ceGhyWKfFeijTa48pvLY=
+SIZE (audacious-3.2.tar.bz2) = 728063
diff --git a/audio/audacious/patches/patch-buildsys_mk_in b/audio/audacious/patches/patch-buildsys_mk_in
index fe2e90e914b..b2660015c79 100644
--- a/audio/audacious/patches/patch-buildsys_mk_in
+++ b/audio/audacious/patches/patch-buildsys_mk_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-buildsys_mk_in,v 1.3 2010/12/19 18:17:55 shadchin Exp $
---- buildsys.mk.in.orig	Wed Dec  8 04:14:31 2010
-+++ buildsys.mk.in	Sun Dec 19 20:50:13 2010
-@@ -34,9 +34,9 @@ LD = ${CC}
+$OpenBSD: patch-buildsys_mk_in,v 1.4 2012/03/20 19:10:18 stsp Exp $
+--- buildsys.mk.in.orig	Fri Jan 20 20:46:56 2012
++++ buildsys.mk.in	Sun Feb  5 19:13:21 2012
+@@ -35,9 +35,9 @@ LD = ${CC}
  RANLIB = @RANLIB@
  PYTHON = @PYTHON@
  ASFLAGS = @ASFLAGS@
@@ -13,12 +13,12 @@ $OpenBSD: patch-buildsys_mk_in,v 1.3 2010/12/19 18:17:55 shadchin Exp $
  DFLAGS = @DFLAGS@
  ERLCFLAGS = @ERLCFLAGS@
  OBJCFLAGS = @OBJCFLAGS@
-@@ -92,7 +92,7 @@ OBJS += ${OBJS9:.S=.o}
+@@ -100,7 +100,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
  
  MO_FILES = ${LOCALES:.po=.mo}
  
 -.SILENT:
 +#.SILENT:
  .SUFFIXES:
- .SUFFIXES: .beam .c .cc .cxx .d .dep .erl .mo .m .mm .o .po .py .pyc .xpm .S
- .PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean
+ .SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o .java .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm
+ .PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales
diff --git a/audio/audacious/patches/patch-m4_buildsys_m4 b/audio/audacious/patches/patch-m4_buildsys_m4
index c0be094cead..e9cd0cac66c 100644
--- a/audio/audacious/patches/patch-m4_buildsys_m4
+++ b/audio/audacious/patches/patch-m4_buildsys_m4
@@ -1,12 +1,12 @@
-$OpenBSD: patch-m4_buildsys_m4,v 1.4 2010/12/27 11:50:45 jasper Exp $
---- m4/buildsys.m4.orig	Tue Dec  7 18:14:31 2010
-+++ m4/buildsys.m4	Sat Dec 25 20:33:20 2010
-@@ -91,7 +91,7 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
- 			LIB_CFLAGS='-fPIC'
- 			LIB_LDFLAGS='-shared -fPIC'
+$OpenBSD: patch-m4_buildsys_m4,v 1.5 2012/03/20 19:10:18 stsp Exp $
+--- m4/buildsys.m4.orig	Fri Jan 20 20:46:56 2012
++++ m4/buildsys.m4	Sun Feb  5 19:13:21 2012
+@@ -124,7 +124,7 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
+ 			LIB_CFLAGS='-fPIC -DPIC'
+ 			LIB_LDFLAGS='-shared'
  			LIB_PREFIX='lib'
 -			LIB_SUFFIX='.so.${LIB_MAJOR}.${LIB_MINOR}'
 +			LIB_SUFFIX='.so'
  			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
- 			PLUGIN_CPPFLAGS='-DPIC'
- 			PLUGIN_CFLAGS='-fPIC'
+ 			PLUGIN_CFLAGS='-fPIC -DPIC'
+ 			PLUGIN_LDFLAGS='-shared'
diff --git a/audio/audacious/patches/patch-man_Makefile b/audio/audacious/patches/patch-man_Makefile
deleted file mode 100644
index 290b7e6d9ce..00000000000
--- a/audio/audacious/patches/patch-man_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-man_Makefile,v 1.1 2010/12/19 18:17:55 shadchin Exp $
---- man/Makefile.orig	Sat Dec  4 19:09:37 2010
-+++ man/Makefile	Sat Dec  4 19:09:47 2010
-@@ -7,9 +7,7 @@ include ../buildsys.mk
- install-extra:
- 	${MKDIR_P} "${DESTDIR}${mandir}/${mansubdir}"
- 	if test -h "${DESTDIR}${mandir}/${mansubdir}/audacious.1" ; then ${RM} "${DESTDIR}${mandir}/${mansubdir}/audacious.1" ; fi
--	${LN_S} audacious2.1 "${DESTDIR}${mandir}/${mansubdir}/audacious.1"
- 	if test -h "${DESTDIR}${mandir}/${mansubdir}/audtool.1" ; then ${RM} "${DESTDIR}${mandir}/${mansubdir}/audtool.1" ; fi
--	${LN_S} audtool2.1 "${DESTDIR}${mandir}/${mansubdir}/audtool.1"
- 
- uninstall-extra:
- 	if test -h "${DESTDIR}${mandir}/${mansubdir}/audacious.1" ; then ${RM} "${DESTDIR}${mandir}/${mansubdir}/audacious.1" ; fi
diff --git a/audio/audacious/patches/patch-src_audacious_Makefile b/audio/audacious/patches/patch-src_audacious_Makefile
deleted file mode 100644
index 6a362babe6f..00000000000
--- a/audio/audacious/patches/patch-src_audacious_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_audacious_Makefile,v 1.1 2010/12/19 18:17:55 shadchin Exp $
---- src/audacious/Makefile.orig	Wed Dec  8 04:14:31 2010
-+++ src/audacious/Makefile	Fri Dec 17 01:31:18 2010
-@@ -151,7 +151,6 @@ dbus-client-bindings.h: ${DBUS_BINDINGS_SOURCES}
- 
- install-extra:
- 	if test -h "${DESTDIR}${bindir}/audacious" ; then ${RM} "${DESTDIR}${bindir}/audacious" ; fi
--	${LN_S} audacious2 "${DESTDIR}${bindir}/audacious"
- 
- 	if test x"${PROG_IMPLIB_NEEDED}" = x"yes"; then \
- 		for i in ${PROG}; do \
diff --git a/audio/audacious/patches/patch-src_audtool_Makefile b/audio/audacious/patches/patch-src_audtool_Makefile
index ffbaf5b6551..9263f6bea2d 100644
--- a/audio/audacious/patches/patch-src_audtool_Makefile
+++ b/audio/audacious/patches/patch-src_audtool_Makefile
@@ -1,11 +1,12 @@
-$OpenBSD: patch-src_audtool_Makefile,v 1.1 2010/12/19 18:17:55 shadchin Exp $
---- src/audtool/Makefile.orig	Sat Dec  4 19:10:32 2010
-+++ src/audtool/Makefile	Sat Dec  4 19:10:40 2010
-@@ -29,7 +29,6 @@ LIBS += ${DBUS_LIBS}				\
- install-extra:
- 	if test -h "${DESTDIR}${bindir}/audtool" ; then ${RM} "${DESTDIR}${bindir}/audtool" ; fi
- 	mkdir -p "${DESTDIR}${bindir}"
--	${LN_S} audtool2 "${DESTDIR}${bindir}/audtool"
+$OpenBSD: patch-src_audtool_Makefile,v 1.2 2012/03/20 19:10:18 stsp Exp $
+prevents linker error if audacious2 is already installed
+--- src/audtool/Makefile.orig	Sun Feb  5 19:47:56 2012
++++ src/audtool/Makefile	Sun Feb  5 19:48:41 2012
+@@ -16,6 +16,4 @@ CPPFLAGS += -I.. -I../.. \
+             ${DBUS_CFLAGS} \
+             ${GTK_CFLAGS}
  
- uninstall-extra:
- 	if test -h "${DESTDIR}${bindir}/audtool" ; then ${RM} "${DESTDIR}${bindir}/audtool" ; fi
+-LIBS += ${DBUS_LIBS}				\
+-	-L../libaudclient -laudclient	\
+-	${GTK_LIBS}
++LIBS += -L../libaudclient -laudclient ${DBUS_LIBS} ${GTK_LIBS}
diff --git a/audio/audacious/patches/patch-src_libaudcore_Makefile b/audio/audacious/patches/patch-src_libaudcore_Makefile
index 9dbb8f49a2f..618911e4c95 100644
--- a/audio/audacious/patches/patch-src_libaudcore_Makefile
+++ b/audio/audacious/patches/patch-src_libaudcore_Makefile
@@ -1,15 +1,15 @@
-$OpenBSD: patch-src_libaudcore_Makefile,v 1.2 2011/04/27 11:44:12 dcoppa Exp $
---- src/libaudcore/Makefile.orig	Tue Feb 22 18:29:02 2011
-+++ src/libaudcore/Makefile	Wed Apr 20 13:38:18 2011
+$OpenBSD: patch-src_libaudcore_Makefile,v 1.3 2012/03/20 19:10:18 stsp Exp $
+--- src/libaudcore/Makefile.orig	Sun Feb  5 19:21:31 2012
++++ src/libaudcore/Makefile	Sun Feb  5 19:22:05 2012
 @@ -1,4 +1,4 @@
 -LIB = ${LIB_PREFIX}audcore${LIB_SUFFIX}
 +LIB = ${LIB_PREFIX}audcore${LIB_SUFFIX}.${LIBaudcore_VERSION}
  LIB_MAJOR = 1
  LIB_MINOR = 0
  
-@@ -43,4 +43,4 @@ includesubdir = libaudcore
- CPPFLAGS += -DHAVE_CONFIG_H ${LIB_CPPFLAGS} ${CFLAGS} -I.. -I../..
- CFLAGS += ${LIB_CFLAGS} ${GLIB_CFLAGS} ${MOWGLI_CFLAGS}
+@@ -32,4 +32,4 @@ includesubdir = libaudcore
+ CPPFLAGS += -DHAVE_CONFIG_H ${PTHREAD_CFLAGS} ${GLIB_CFLAGS} -I.. -I../..
+ CFLAGS += ${LIB_CFLAGS}
  
--LIBS += ${GLIB_LIBS} ${MOWGLI_LIBS}
-+LIBS += ${GLIB_LIBS} ${MOWGLI_LIBS} -lexecinfo
+-LIBS += ${PTHREAD_LIBS} ${GLIB_LIBS} -lm
++LIBS += ${PTHREAD_LIBS} ${GLIB_LIBS} -lm -lexecinfo
diff --git a/audio/audacious/patches/patch-src_libaudcore_audio_c b/audio/audacious/patches/patch-src_libaudcore_audio_c
index dc53fe6b5fb..3e5640db365 100644
--- a/audio/audacious/patches/patch-src_libaudcore_audio_c
+++ b/audio/audacious/patches/patch-src_libaudcore_audio_c
@@ -1,40 +1,40 @@
-$OpenBSD: patch-src_libaudcore_audio_c,v 1.1 2010/12/19 18:17:55 shadchin Exp $
---- src/libaudcore/audio.c.orig	Thu Aug 26 05:04:25 2010
-+++ src/libaudcore/audio.c	Tue Dec  7 15:54:16 2010
-@@ -64,22 +64,22 @@ TO_INT_LOOP (to_u24, gint32, noop32, 0x800000, 0x7ffff
- TO_INT_LOOP (to_s32, gint32, noop32, 0x00000000, 0x7fffffff)
- TO_INT_LOOP (to_u32, gint32, noop32, 0x80000000, 0x7fffffff)
+$OpenBSD: patch-src_libaudcore_audio_c,v 1.2 2012/03/20 19:10:18 stsp Exp $
+--- src/libaudcore/audio.c.orig	Fri Jan 20 20:46:56 2012
++++ src/libaudcore/audio.c	Sun Feb  5 19:18:18 2012
+@@ -63,22 +63,22 @@ TO_INT_LOOP (to_u24, int32_t, noop32, 0x800000, 0x7fff
+ TO_INT_LOOP (to_s32, int32_t, noop32, 0x00000000, 0x7fffffff)
+ TO_INT_LOOP (to_u32, int32_t, noop32, 0x80000000, 0x7fffffff)
  
--static inline gint16 swap16 (gint16 i) {return GUINT16_SWAP_LE_BE (i);}
--static inline gint32 swap32 (gint32 i) {return GUINT32_SWAP_LE_BE (i);}
-+static inline gint16 Aswap16 (gint16 i) {return GUINT16_SWAP_LE_BE (i);}
-+static inline gint32 Aswap32 (gint32 i) {return GUINT32_SWAP_LE_BE (i);}
+-static inline int16_t swap16 (int16_t i) {return GUINT16_SWAP_LE_BE (i);}
+-static inline int32_t swap32 (int32_t i) {return GUINT32_SWAP_LE_BE (i);}
++static inline int16_t Aswap16 (int16_t i) {return GUINT16_SWAP_LE_BE (i);}
++static inline int32_t Aswap32 (int32_t i) {return GUINT32_SWAP_LE_BE (i);}
  
--FROM_INT_LOOP (from_s16_swap, gint16, swap16, 0x0000, 0x7fff)
--FROM_INT_LOOP (from_u16_swap, gint16, swap16, 0x8000, 0x7fff)
--FROM_INT_LOOP (from_s24_swap, gint32, swap32, 0x000000, 0x7fffff)
--FROM_INT_LOOP (from_u24_swap, gint32, swap32, 0x800000, 0x7fffff)
--FROM_INT_LOOP (from_s32_swap, gint32, swap32, 0x00000000, 0x7fffffff)
--FROM_INT_LOOP (from_u32_swap, gint32, swap32, 0x80000000, 0x7fffffff)
-+FROM_INT_LOOP (from_s16_swap, gint16, Aswap16, 0x0000, 0x7fff)
-+FROM_INT_LOOP (from_u16_swap, gint16, Aswap16, 0x8000, 0x7fff)
-+FROM_INT_LOOP (from_s24_swap, gint32, Aswap32, 0x000000, 0x7fffff)
-+FROM_INT_LOOP (from_u24_swap, gint32, Aswap32, 0x800000, 0x7fffff)
-+FROM_INT_LOOP (from_s32_swap, gint32, Aswap32, 0x00000000, 0x7fffffff)
-+FROM_INT_LOOP (from_u32_swap, gint32, Aswap32, 0x80000000, 0x7fffffff)
+-FROM_INT_LOOP (from_s16_swap, int16_t, swap16, 0x0000, 0x7fff)
+-FROM_INT_LOOP (from_u16_swap, int16_t, swap16, 0x8000, 0x7fff)
+-FROM_INT_LOOP (from_s24_swap, int32_t, swap32, 0x000000, 0x7fffff)
+-FROM_INT_LOOP (from_u24_swap, int32_t, swap32, 0x800000, 0x7fffff)
+-FROM_INT_LOOP (from_s32_swap, int32_t, swap32, 0x00000000, 0x7fffffff)
+-FROM_INT_LOOP (from_u32_swap, int32_t, swap32, 0x80000000, 0x7fffffff)
++FROM_INT_LOOP (from_s16_swap, int16_t, Aswap16, 0x0000, 0x7fff)
++FROM_INT_LOOP (from_u16_swap, int16_t, Aswap16, 0x8000, 0x7fff)
++FROM_INT_LOOP (from_s24_swap, int32_t, Aswap32, 0x000000, 0x7fffff)
++FROM_INT_LOOP (from_u24_swap, int32_t, Aswap32, 0x800000, 0x7fffff)
++FROM_INT_LOOP (from_s32_swap, int32_t, Aswap32, 0x00000000, 0x7fffffff)
++FROM_INT_LOOP (from_u32_swap, int32_t, Aswap32, 0x80000000, 0x7fffffff)
  
--TO_INT_LOOP (to_s16_swap, gint16, swap16, 0x0000, 0x7fff)
--TO_INT_LOOP (to_u16_swap, gint16, swap16, 0x8000, 0x7fff)
--TO_INT_LOOP (to_s24_swap, gint32, swap32, 0x000000, 0x7fffff)
--TO_INT_LOOP (to_u24_swap, gint32, swap32, 0x800000, 0x7fffff)
--TO_INT_LOOP (to_s32_swap, gint32, swap32, 0x00000000, 0x7fffffff)
--TO_INT_LOOP (to_u32_swap, gint32, swap32, 0x80000000, 0x7fffffff)
-+TO_INT_LOOP (to_s16_swap, gint16, Aswap16, 0x0000, 0x7fff)
-+TO_INT_LOOP (to_u16_swap, gint16, Aswap16, 0x8000, 0x7fff)
-+TO_INT_LOOP (to_s24_swap, gint32, Aswap32, 0x000000, 0x7fffff)
-+TO_INT_LOOP (to_u24_swap, gint32, Aswap32, 0x800000, 0x7fffff)
-+TO_INT_LOOP (to_s32_swap, gint32, Aswap32, 0x00000000, 0x7fffffff)
-+TO_INT_LOOP (to_u32_swap, gint32, Aswap32, 0x80000000, 0x7fffffff)
+-TO_INT_LOOP (to_s16_swap, int16_t, swap16, 0x0000, 0x7fff)
+-TO_INT_LOOP (to_u16_swap, int16_t, swap16, 0x8000, 0x7fff)
+-TO_INT_LOOP (to_s24_swap, int32_t, swap32, 0x000000, 0x7fffff)
+-TO_INT_LOOP (to_u24_swap, int32_t, swap32, 0x800000, 0x7fffff)
+-TO_INT_LOOP (to_s32_swap, int32_t, swap32, 0x00000000, 0x7fffffff)
+-TO_INT_LOOP (to_u32_swap, int32_t, swap32, 0x80000000, 0x7fffffff)
++TO_INT_LOOP (to_s16_swap, int16_t, Aswap16, 0x0000, 0x7fff)
++TO_INT_LOOP (to_u16_swap, int16_t, Aswap16, 0x8000, 0x7fff)
++TO_INT_LOOP (to_s24_swap, int32_t, Aswap32, 0x000000, 0x7fffff)
++TO_INT_LOOP (to_u24_swap, int32_t, Aswap32, 0x800000, 0x7fffff)
++TO_INT_LOOP (to_s32_swap, int32_t, Aswap32, 0x00000000, 0x7fffffff)
++TO_INT_LOOP (to_u32_swap, int32_t, Aswap32, 0x80000000, 0x7fffffff)
  
- typedef void (* FromFunc) (void * in, gfloat * out, gint samples);
- typedef void (* ToFunc) (gfloat * in, void * out, gint samples);
+ typedef void (* FromFunc) (const void * in, float * out, int samples);
+ typedef void (* ToFunc) (const float * in, void * out, int samples);
diff --git a/audio/audacious/pkg/PLIST b/audio/audacious/pkg/PLIST
index 640503e5ea2..fcb3b8b29aa 100644
--- a/audio/audacious/pkg/PLIST
+++ b/audio/audacious/pkg/PLIST
@@ -1,24 +1,21 @@
-@comment $OpenBSD: PLIST,v 1.12 2011/12/03 18:55:28 ajacoutot Exp $
-@bin bin/audacious2
-@bin bin/audtool2
+@comment $OpenBSD: PLIST,v 1.13 2012/03/20 19:10:18 stsp Exp $
+@bin bin/audacious
+@bin bin/audtool
 include/audacious/
 include/audacious/api-alias-begin.h
 include/audacious/api-alias-end.h
 include/audacious/api-define-begin.h
 include/audacious/api-define-end.h
 include/audacious/api.h
-include/audacious/audconfig.h
 include/audacious/audctrl.h
 include/audacious/audtag.h
-include/audacious/configdb-api.h
-include/audacious/configdb.h
 include/audacious/dbus-service.h
 include/audacious/dbus.h
 include/audacious/debug.h
 include/audacious/drct-api.h
 include/audacious/drct.h
+include/audacious/gtk-compat.h
 include/audacious/i18n.h
-include/audacious/interface.h
 include/audacious/misc-api.h
 include/audacious/misc.h
 include/audacious/playlist-api.h
@@ -31,48 +28,39 @@ include/audacious/types.h
 include/libaudcore/
 include/libaudcore/audio.h
 include/libaudcore/audstrings.h
-include/libaudcore/eventqueue.h
+include/libaudcore/core.h
 include/libaudcore/hook.h
 include/libaudcore/index.h
-include/libaudcore/log.h
-include/libaudcore/md5.h
-include/libaudcore/stringpool.h
 include/libaudcore/tuple.h
-include/libaudcore/tuple_compiler.h
-include/libaudcore/tuple_formatter.h
 include/libaudcore/vfs.h
 include/libaudcore/vfs_async.h
-include/libaudcore/vfs_buffer.h
-include/libaudcore/vfs_buffered_file.h
 include/libaudgui/
 include/libaudgui/libaudgui-gtk.h
 include/libaudgui/libaudgui.h
+include/libaudgui/list.h
 @lib lib/libaudclient.so.${LIBaudclient_VERSION}
 @lib lib/libaudcore.so.${LIBaudcore_VERSION}
 @lib lib/libaudgui.so.${LIBaudgui_VERSION}
 @lib lib/libaudtag.so.${LIBaudtag_VERSION}
 lib/pkgconfig/audacious.pc
 lib/pkgconfig/audclient.pc
-@man man/man1/audacious2.1
-@man man/man1/audtool2.1
-share/applications/audacious2.desktop
+@man man/man1/audacious.1
+@man man/man1/audtool.1
+share/applications/audacious.desktop
 share/audacious/
 share/audacious/images/
 share/audacious/images/about-logo.png
-share/audacious/images/appearance.png
+share/audacious/images/album.png
 share/audacious/images/audacious_eq.xpm
 share/audacious/images/audacious_player.xpm
 share/audacious/images/audacious_playlist.xpm
 share/audacious/images/audio.png
-share/audacious/images/blue.png
 share/audacious/images/connectivity.png
 share/audacious/images/menu_playlist.png
 share/audacious/images/menu_plugin.png
 share/audacious/images/menu_queue_toggle.png
-share/audacious/images/playback.png
 share/audacious/images/playlist.png
 share/audacious/images/plugins.png
-share/audacious/images/replay_gain.png
 share/icons/hicolor/48x48/apps/audacious.png
 share/icons/hicolor/scalable/apps/audacious.svg
 share/locale/ast/LC_MESSAGES/audacious.mo
@@ -85,6 +73,12 @@ share/locale/cy/LC_MESSAGES/audacious.mo
 share/locale/de/LC_MESSAGES/audacious.mo
 share/locale/el/LC_MESSAGES/audacious.mo
 share/locale/es/LC_MESSAGES/audacious.mo
+share/locale/es_AR/
+share/locale/es_AR/LC_MESSAGES/
+share/locale/es_AR/LC_MESSAGES/audacious.mo
+share/locale/es_MX/
+share/locale/es_MX/LC_MESSAGES/
+share/locale/es_MX/LC_MESSAGES/audacious.mo
 share/locale/et/LC_MESSAGES/audacious.mo
 share/locale/eu/LC_MESSAGES/audacious.mo
 share/locale/fi/LC_MESSAGES/audacious.mo
@@ -108,6 +102,7 @@ share/locale/pt_PT/LC_MESSAGES/audacious.mo
 share/locale/ro/LC_MESSAGES/audacious.mo
 share/locale/ru/LC_MESSAGES/audacious.mo
 share/locale/sk/LC_MESSAGES/audacious.mo
+share/locale/sl/LC_MESSAGES/audacious.mo
 share/locale/sr/LC_MESSAGES/audacious.mo
 share/locale/sr@Latn/
 share/locale/sr@Latn/LC_MESSAGES/
@@ -115,6 +110,7 @@ share/locale/sr@Latn/LC_MESSAGES/audacious.mo
 share/locale/sv/LC_MESSAGES/audacious.mo
 share/locale/tr/LC_MESSAGES/audacious.mo
 share/locale/uk/LC_MESSAGES/audacious.mo
+share/locale/vi/LC_MESSAGES/audacious.mo
 share/locale/zh_CN/LC_MESSAGES/audacious.mo
 share/locale/zh_TW/LC_MESSAGES/audacious.mo
 share/pixmaps/