diff --git a/audio/playgsf/Makefile b/audio/playgsf/Makefile
index 2c6c2c46e5f5..45fb748e418d 100644
--- a/audio/playgsf/Makefile
+++ b/audio/playgsf/Makefile
@@ -1,51 +1,48 @@
 PORTNAME=	playgsf
-PORTVERSION=	0.7.1
-PORTREVISION=	4
+DISTVERSION=	0.7.1
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://projects.raphnet.net/playgsf/ \
 		LOCAL/ehaupt
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Command-line player for gsf audio files
-WWW=		http://projects.raphnet.net/ #playgsf
+WWW=		http://projects.raphnet.net/
 
 LICENSE=	GPLv2+ LGPL21 NONE
 LICENSE_COMB=	multi
 LICENSE_FILE_LGPL21=	${WRKSRC}/libresample-0.1.3/LICENSE.txt
 
+ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 powerpc64le
+
 LIB_DEPENDS=	libao.so:audio/libao
 
 USES=		dos2unix gmake localbase:ldflags
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-ccore \
-		--disable-optimisations
-
-PLIST_FILES=	bin/playgsf
+CONFIGURE_ARGS=	--disable-optimisations \
+		--enable-ccore
 
-ONLY_FOR_ARCHS=	i386 amd64 powerpc64le powerpc64 powerpc
+EXTRACT_AFTER_ARGS=	--exclude libresample-0.1.3/libresample.a
 
 PORTSCOUT=	skipv:0.7.2
-
-post-extract:
-	# Don't use accidentally packaged static library
-	@${RM} ${WRKSRC}/libresample-0.1.3/libresample.a
+PLIST_FILES=	bin/playgsf
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|\([[:space:]]*\).*configure.*|\1@true|' \
 			${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} \
 		-e '/^CFLAGS="-DLINUX/s|"$$| ${CFLAGS}"|' \
 		-e '/^LDFLAGS="-lz/s|"$$| ${LDFLAGS}"|' \
 		${WRKSRC}/configure
 
 post-configure:
 	@(cd ${WRKSRC}/libresample-0.1.3 && ${SETENV} \
 		CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
 		CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 		${CONFIGURE_ENV} ./configure)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>