diff --git a/audio/abraca/Makefile b/audio/abraca/Makefile
index 10e06db71de3..1ea20c83f58c 100644
--- a/audio/abraca/Makefile
+++ b/audio/abraca/Makefile
@@ -6,29 +6,23 @@
 #
 
 PORTNAME=	abraca
-PORTVERSION=	0.2
-PORTREVISION=	3
+PORTVERSION=	0.4
+DISTVERSIONSUFFIX=-pre2
 CATEGORIES=	audio
-MASTER_SITES=	http://nooms.de/media/abraca/
+MASTER_SITES=	http://abraca.xmms.se/attachments/download/100/
 
 MAINTAINER=	olivier@gid0.org
 COMMENT=	Abraca is a GTK2 client for the XMMS2 music player
 
-LIB_DEPENDS=	xmmsclient.4:${PORTSDIR}/audio/xmms2 \
-		xmmsclient-glib.1:${PORTSDIR}/audio/xmms2
+LIB_DEPENDS=	xmmsclient.5:${PORTSDIR}/audio/xmms2
 
-USE_BZIP2=	yes
-USE_PYTHON_BUILD=	yes
+USE_GMAKE=	yes
+ALL_TARGET=	# defined
+USE_GNOME=	gtk20
 
-USE_GNOME=	pkgconfig libglade2 glib20 gtk20
-
-do-configure:
-	cd ${WRKSRC} && env HOME=${WRKSRC} ./waf configure --prefix=${PREFIX}
-
-do-build:
-	cd ${WRKSRC} && ./waf build
+PLIST_FILES=	bin/${PORTNAME}
 
 do-install:
-	cd ${WRKSRC} && ./waf install
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/audio/abraca/distinfo b/audio/abraca/distinfo
index facf2cea7b1d..73f93187ec70 100644
--- a/audio/abraca/distinfo
+++ b/audio/abraca/distinfo
@@ -1,3 +1,3 @@
-MD5 (abraca-0.2.tar.bz2) = 6a3e258aa38a53f430394e48c7c7310c
-SHA256 (abraca-0.2.tar.bz2) = 8af6873c0bbe50a00c9ad52deb36377de4876e1200b3c76606f2e08a536013e6
-SIZE (abraca-0.2.tar.bz2) = 113753
+MD5 (abraca-0.4-pre2.tar.gz) = ccfaf2bb1d01f0ab9915896bdad859c1
+SHA256 (abraca-0.4-pre2.tar.gz) = b2af3a885d6398735c581e43edb45658ed0190e69f99b3f55e7dfa3d6f85ce4b
+SIZE (abraca-0.4-pre2.tar.gz) = 155504
diff --git a/audio/abraca/pkg-plist b/audio/abraca/pkg-plist
deleted file mode 100644
index 503aea7a4ed1..000000000000
--- a/audio/abraca/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/abraca
-%%DATADIR%%/abraca.glade
-@dirrm %%DATADIR%%