diff --git a/multimedia/gstreamer1-plugins-all/Makefile b/multimedia/gstreamer1-plugins-all/Makefile
index ce2132521a18..7e8d806965f6 100644
--- a/multimedia/gstreamer1-plugins-all/Makefile
+++ b/multimedia/gstreamer1-plugins-all/Makefile
@@ -1,39 +1,23 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 
 PORTNAME=	gstreamer1-plugins-all
 PORTVERSION=	1.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 
 MAINTAINER=	multimedia@FreeBSD.org
-COMMENT=	Meta-port of all GStreamer 1.x plugins with options
+COMMENT=	Meta-port of all GStreamer 1.x plugins
 
-USES=		metaport
+USES=		gstreamer metaport
 
-ALL_PLUGINS:=	${_GSTREAMER_PLUGINS}
 # Weed out gst-plugins that can not be packaged. or are broken.
 .if defined(PACKAGE_BUILDING)
 # FAAC:    Mp4 Dolby license , no package
 # LAME:    MP3 License , no package
 # VDPAU:   Needs to be build agains running kernel
-DEF_PLUGINS:=	${_GSTREAMER_PLUGINS:Nfaac:Nlame:Nvdpau}
+USE_GSTREAMER=	${_GST_PLUGINS_VER:Nfaac:Nlame:Nvdpau}
 .else
-DEF_PLUGINS:=	${_GSTREAMER_PLUGINS}
+USE_GSTREAMER=	${_GST_PLUGINS_VER}
 .endif
 
-.for all in ${ALL_PLUGINS}
-${all:tu}_DESC=	${all} plugin
-${all:tu}_USE=	GSTREAMER=${all}
-.endfor
-
-# Pull out i386-only plugins, add back conditionally
-ALL_PLUGINS:=	${ALL_PLUGINS:Nspc}
-DEF_PLUGINS:=	${DEF_PLUGINS:Nspc}
-
-OPTIONS_DEFINE=	${ALL_PLUGINS:tu}
-OPTIONS_DEFAULT=	${DEF_PLUGINS:tu}
-
-OPTIONS_DEFINE_i386=	SPC
-OPTIONS_DEFAULT_i386=	SPC
-
 .include <bsd.port.mk>
diff --git a/multimedia/gstreamer1-plugins-all/pkg-descr b/multimedia/gstreamer1-plugins-all/pkg-descr
index 41d88c6fb17b..6997bf57da7d 100644
--- a/multimedia/gstreamer1-plugins-all/pkg-descr
+++ b/multimedia/gstreamer1-plugins-all/pkg-descr
@@ -1 +1,3 @@
-Meta-port of all gstreamer-plugins with options.
+Meta-port of all gstreamer-plugins.
+
+WWW: https://gstreamer.freedesktop.org/