diff --git a/audio/xmms-faad/Makefile b/audio/xmms-faad/Makefile
index 2ffa1de47260..14559151e807 100644
--- a/audio/xmms-faad/Makefile
+++ b/audio/xmms-faad/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	faad2
-PORTVERSION=	2.7
-PORTREVISION=	5
+PORTVERSION=	2.8.6
 CATEGORIES=	audio
-MASTER_SITES=	SF/faac/${PORTNAME}-src/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	SF/faac/${PORTNAME}-src/${PORTNAME}-${PORTVERSION:R}.0
 PKGNAMEPREFIX=	xmms-
 
 MAINTAINER=	ports@FreeBSD.org
@@ -19,8 +18,8 @@ LIB_DEPENDS=	libxmms.so:multimedia/xmms \
 
 WRKSRC_SUBDIR=	plugins/xmms/src
 
+USES=		pkgconfig
 USE_GNOME=	gtk12
-USES=		pkgconfig tar:bzip2
 EXTRA_CFLAGS=	`xmms-config --cflags`
 EXTRA_LDFLAGS=	`xmms-config --libs`
 
diff --git a/audio/xmms-faad/distinfo b/audio/xmms-faad/distinfo
index a34f468e06a6..b0c4d52249e9 100644
--- a/audio/xmms-faad/distinfo
+++ b/audio/xmms-faad/distinfo
@@ -1,2 +1,3 @@
-SHA256 (faad2-2.7.tar.bz2) = 14561b5d6bc457e825bfd3921ae50a6648f377a9396eaf16d4b057b39a3f63b5
-SIZE (faad2-2.7.tar.bz2) = 901043
+TIMESTAMP = 1509543431
+SHA256 (faad2-2.8.6.tar.gz) = 654977adbf62eb81f4fca00152aca58ce3b6dd157181b9edd7bed687a7c73f21
+SIZE (faad2-2.8.6.tar.gz) = 1025654