diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 73809bc47374..19fde86847c2 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2015/02/21 23:13:10 ryoon Exp $
+# $NetBSD: Makefile,v 1.96 2015/02/25 12:27:13 tnn Exp $
 
 DISTNAME=	pulseaudio-6.0
 CATEGORIES=	audio
@@ -14,10 +14,10 @@ LIBTOOL_REQD=	2.4
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=	aclocal autoheader autoconf automake gmake gm4 intltool msgfmt pkg-config
+USE_TOOLS+=	aclocal autoheader autoconf automake gmake gm4 intltool msgfmt pkg-config bash
 USE_LANGUAGES=	c c++
 
-REPLACE_BASH=	shell-completion/pulseaudio-bash-completion.sh
+REPLACE_BASH=	shell-completion/bash/pulseaudio git-version-gen
 
 .include "../../mk/bsd.prefs.mk"
 # Some tests are incompatible for NetBSD at least
@@ -103,9 +103,9 @@ PKG_GROUPS+=		${PULSE_GROUP_REALTIME}
 PKG_GROUPS+=		${PULSE_GROUP_ACCESS}
 PKG_USERS=		${PULSE_USER}:${PULSE_GROUP}
 
-pre-configure:
-	set -e; cd ${WRKSRC}; \
-	aclocal; autoheader; automake -a --foreign -i; autoconf
+pre-configure: replace-interpreter
+	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoreconf -if
+	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} intltoolize -f
 
 .if ${OPSYS} != "Darwin"
 .include "../../sysutils/consolekit/buildlink3.mk"