diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile
index a5a01c04d394..1ce1b311c699 100644
--- a/net/glib-networking/Makefile
+++ b/net/glib-networking/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	glib-networking
 PORTVERSION=	2.36.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -12,14 +12,9 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Network-related giomodules for glib
 
-BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libproxy.so:${PORTSDIR}/net/libproxy
-RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
@@ -29,6 +24,23 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
+OPTIONS_DEFINE=	GNUTLS PKCS11 PROXY GNOME_PROXY
+OPTIONS_DEFAULT=GNUTLS PKCS11 PROXY GNOME_PROXY
+OPTIONS_SUB=	yes
+
+GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_CONFIGURE_WITH=	gnutls
+PKCS11_DESC=		Enable PKCS11 support (requires GNUTLS)
+PKCS11_LIB_DEPENDS=	libp11-kit.so:${PORTSDIR}/security/p11-kit \
+			libgnutls.so:${PORTSDIR}/security/gnutls
+PKCS11_CONFIGURE_WITH=	pkcs11
+PROXY_LIB_DEPENDS=	libproxy.so:${PORTSDIR}/net/libproxy
+PROXY_CONFIGURE_WITH=	libproxy
+GNOME_PROXY_DESC=	Support for GNOME proxy configuration
+GNOME_PROXY_BUILD_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+GNOME_PROXY_RUN_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+GNOME_PROXY_CONFIGURE_WITH=	gnome-proxy
+
 post-patch:
 	@${REINPLACE_CMD} -e' s|-Wmissing-include-dirs||g' ${WRKSRC}/configure
 
diff --git a/net/glib-networking/pkg-plist b/net/glib-networking/pkg-plist
index ee319a7ba6f9..d87dee0dfd59 100644
--- a/net/glib-networking/pkg-plist
+++ b/net/glib-networking/pkg-plist
@@ -1,14 +1,14 @@
-lib/gio/modules/libgiognomeproxy.a
-lib/gio/modules/libgiognomeproxy.la
-lib/gio/modules/libgiognomeproxy.so
-lib/gio/modules/libgiognutls.a
-lib/gio/modules/libgiognutls.la
-lib/gio/modules/libgiognutls.so
-lib/gio/modules/libgiolibproxy.a
-lib/gio/modules/libgiolibproxy.la
-lib/gio/modules/libgiolibproxy.so
-libexec/glib-pacrunner
-share/dbus-1/services/org.gtk.GLib.PACRunner.service
+%%GNOME_PROXY%%lib/gio/modules/libgiognomeproxy.a
+%%GNOME_PROXY%%lib/gio/modules/libgiognomeproxy.la
+%%GNOME_PROXY%%lib/gio/modules/libgiognomeproxy.so
+%%GNUTLS%%lib/gio/modules/libgiognutls.a
+%%GNUTLS%%lib/gio/modules/libgiognutls.la
+%%GNUTLS%%lib/gio/modules/libgiognutls.so
+%%PROXY%%lib/gio/modules/libgiolibproxy.a
+%%PROXY%%lib/gio/modules/libgiolibproxy.la
+%%PROXY%%lib/gio/modules/libgiolibproxy.so
+%%PROXY%%libexec/glib-pacrunner
+%%PROXY%%share/dbus-1/services/org.gtk.GLib.PACRunner.service
 share/locale/an/LC_MESSAGES/glib-networking.mo
 share/locale/ar/LC_MESSAGES/glib-networking.mo
 share/locale/as/LC_MESSAGES/glib-networking.mo
@@ -93,5 +93,7 @@ share/locale/zh_TW/LC_MESSAGES/glib-networking.mo
 @dirrmtry share/locale/as
 @dirrmtry share/locale/an/LC_MESSAGES
 @dirrmtry share/locale/an
+%%PROXY%%@dirrmtry share/dbus-1/services
+%%PROXY%%@dirrmtry share/dbus-1
 @exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
 @unexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true