diff --git a/audio/listener/Makefile b/audio/listener/Makefile
index 22f363bda2d2..8959dd846fe6 100644
--- a/audio/listener/Makefile
+++ b/audio/listener/Makefile
@@ -2,27 +2,40 @@
 # $FreeBSD$
 
 PORTNAME=	listener
-PORTVERSION=	1.7.2
+PORTVERSION=	2.2
 CATEGORIES=	audio security
-MASTER_SITES=	http://www.vanheusden.com/listener/ \
-		http://redundancy.redundancy.org/mirror/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	PACKETSTORM/linux/security \
+		http://www.vanheusden.com/listener/
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Program to listen for and record sound activity
 
-LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+LICENSE=	GPLv2
 
-PORTDOCS=	manual.html
+BUILD_DEPENDS=	portaudio2>0:${PORTSDIR}/audio/portaudio2
+LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+RUN_DEPENDS=	portaudio2>0:${PORTSDIR}/audio/portaudio2
+
+USES=		ncurses tar:tgz
+
+CPPFLAGS+=	-I${LOCALBASE}/include/portaudio2 -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib/portaudio2 -L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|-g |$$(CPPFLAGS) | ; \
+		 s|-O2 || ; \
+		 s|-ldl |$$(LDFLAGS) |' ${WRKSRC}/Makefile
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+do-install:
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} listener setlistener \
+		${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC} && ${INSTALL_DATA} listener.conf \
+		${STAGEDIR}${PREFIX}/etc/listener.conf.sample)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
+	(cd ${WRKSRC} && ${INSTALL_DATA} manual.html \
+		${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/audio/listener/distinfo b/audio/listener/distinfo
index 6dfd5a91a817..40df060857b5 100644
--- a/audio/listener/distinfo
+++ b/audio/listener/distinfo
@@ -1,2 +1,2 @@
-SHA256 (listener-1.7.2.tgz) = 7862ff99c3e85058dfb938d3b86fec299a69bedb845abd8a7f1cfd129062a49c
-SIZE (listener-1.7.2.tgz) = 17489
+SHA256 (listener-2.2.tgz) = 890836e94e3df9f0cd83b2cb9ed98f9a072cb4aaa3d5ebfc78785a6ad2d47bba
+SIZE (listener-2.2.tgz) = 26352
diff --git a/audio/listener/files/patch-Makefile b/audio/listener/files/patch-Makefile
deleted file mode 100644
index 552369cdece0..000000000000
--- a/audio/listener/files/patch-Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
---- Makefile.orig	2005-12-22 00:14:01.000000000 +0800
-+++ Makefile	2014-05-23 00:37:06.799688220 +0800
-@@ -1,8 +1,8 @@
- VERSION=1.7.2
- 
--INSTALL_PREFIX=/usr/local
-+INSTALL_PREFIX=${PREFIX}
- 
--CFLAGS+=-g -O2 -Wall -DVERSION=\"$(VERSION)\"
-+CFLAGS+=-L${LOCALBASE}/lib -I${LOCALBASE}/include -Wall -DVERSION=\"$(VERSION)\"
- 
- OBJSsl=sl.o snd_dev.o error.o utils.o
- OBJSli=listener.o snd_dev.o error.o utils.o lib.o
-@@ -11,19 +11,19 @@ OBJSsp=snd_dev.o lsp.o error.o utils.o
- all: setlistener listener listenersoundpipe
- 
- setlistener: $(OBJSsl)
--	$(CC) -g -Wall -W $(OBJSsl) -ldl -lncurses -o setlistener
-+	$(CC) $(CFLAGS) -g -Wall -W $(OBJSsl) -lncurses -o setlistener
- 
- listener: $(OBJSli)
--	$(CC) -g -Wall -W $(OBJSli) -ldl -lm -lsndfile -o listener -DCONFIGFILE=$(INSTALL_PREFIX)/etc/listener.conf
-+	$(CC) $(CFLAGS) -g -Wall -W $(OBJSli) -lsndfile -o listener -DCONFIGFILE=$(INSTALL_PREFIX)/etc/listener.conf
- 
- listenersoundpipe: $(OBJSsp)
--	$(CC) -g -Wall -W $(OBJSsp) -o listenersoundpipe
-+	$(CC) $(CFLAGS) -g -Wall -W $(OBJSsp) -o listenersoundpipe
- 
- install: setlistener listener listenersoundpipe
--	cp setlistener $(INSTALL_PREFIX)/bin
--	cp listenersoundpipe $(INSTALL_PREFIX)/bin
--	cp listener $(INSTALL_PREFIX)/bin
--	cp listener.conf $(INSTALL_PREFIX)/etc/
-+	cp setlistener $(DESTDIR)$(INSTALL_PREFIX)/bin
-+	cp listenersoundpipe $(DESTDIR)$(INSTALL_PREFIX)/bin
-+	cp listener $(DESTDIR)$(INSTALL_PREFIX)/bin
-+	cp listener.conf $(DESTDIR)$(INSTALL_PREFIX)/etc/listener.conf.sample
- 
- uninstall: clean
- 	rm -f $(INSTALL_PREFIX)/bin/setlistener
diff --git a/audio/listener/pkg-plist b/audio/listener/pkg-plist
index 0eaf9b38e4af..c0d9a2315b23 100644
--- a/audio/listener/pkg-plist
+++ b/audio/listener/pkg-plist
@@ -1,4 +1,5 @@
 bin/listener
-bin/listenersoundpipe
 bin/setlistener
 @sample etc/listener.conf.sample
+%%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%