diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	pulseaudio
 DISTVERSION=	16.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	https://freedesktop.org/software/pulseaudio/releases/
 
@@ -15,6 +15,11 @@
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LGPL
 
+SUBPACKAGES=	jack
+
+COMMENT.jack		= JACK source and sink for PulseAudio
+SELF_DEPENDS.jack	= main
+
 BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
 		libfftw3.so:math/fftw3 \
@@ -22,6 +27,7 @@
 		libdbus-1.so:devel/dbus \
 		libltdl.so:devel/libltdl \
 		libck-connector.so:sysutils/consolekit2
+LIB_DEPENDS.jack=	libjack.so:audio/jack
 
 USES=		compiler:c11 cpe gettext-tools gmake gnome iconv localbase:ldflags \
 		meson pathfix pkgconfig python:run shebangfix ssl tar:xz
@@ -60,12 +66,10 @@
 X11_USE=	XORG=ice,sm,x11,xcb,xtst
 
 OPTIONS_GROUP=	AUDIO
-OPTIONS_GROUP_AUDIO=	ALSA JACK SOXR SPEEX WEBRTC_AEC
+OPTIONS_GROUP_AUDIO=	ALSA SOXR SPEEX WEBRTC_AEC
 AUDIO_DESC=	Audio support
 ALSA_MESON_ENABLED=	alsa
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
-JACK_MESON_ENABLED=	jack
-JACK_LIB_DEPENDS=	libjack.so:audio/jack
 SOXR_MESON_ENABLED=	soxr
 SOXR_LIB_DEPENDS=	libsoxr.so:audio/libsoxr
 SPEEX_DESC=	Speex resampler and AEC support
@@ -87,7 +91,7 @@
 TDB_MESON_ON=	-Ddatabase=tdb
 TDB_LIB_DEPENDS=	libtdb.so:databases/tdb
 
-MESON_ARGS=	-Db_lundef=false -Dasyncns=disabled -Dbluez5=disabled -Dbluez5-gstreamer=disabled -Ddoxygen=false -Delogind=disabled -Dgstreamer=disabled -Dgtk=disabled -Dlirc=disabled -Dsystemd=disabled -Dvalgrind=disabled
+MESON_ARGS=	-Db_lundef=false -Dasyncns=disabled -Dbluez5=disabled -Dbluez5-gstreamer=disabled -Ddoxygen=false -Delogind=disabled -Dgstreamer=disabled -Dgtk=disabled -Dlirc=disabled -Dsystemd=disabled -Dvalgrind=disabled -Djack=enabled
 
 PULSE_VERSION=	${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PLIST_SUB=	PULSE_VERSION=${PULSE_VERSION}
diff --git a/audio/pulseaudio/pkg-descr.jack b/audio/pulseaudio/pkg-descr.jack
new file mode 100644
--- /dev/null
+++ b/audio/pulseaudio/pkg-descr.jack
@@ -0,0 +1,2 @@
+The JACK module for PulseAudio allows it to use JACK (audio/jack) as an output
+sink.
diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist
--- a/audio/pulseaudio/pkg-plist
+++ b/audio/pulseaudio/pkg-plist
@@ -101,9 +101,9 @@
 lib/pulseaudio/modules/module-http-protocol-tcp.so
 lib/pulseaudio/modules/module-http-protocol-unix.so
 lib/pulseaudio/modules/module-intended-roles.so
-%%JACK%%lib/pulseaudio/modules/module-jackdbus-detect.so
-%%JACK%%lib/pulseaudio/modules/module-jack-sink.so
-%%JACK%%lib/pulseaudio/modules/module-jack-source.so
+@@jack@@lib/pulseaudio/modules/module-jackdbus-detect.so
+@@jack@@lib/pulseaudio/modules/module-jack-sink.so
+@@jack@@lib/pulseaudio/modules/module-jack-source.so
 lib/pulseaudio/modules/module-ladspa-sink.so
 lib/pulseaudio/modules/module-loopback.so
 lib/pulseaudio/modules/module-match.so