diff --git a/devel/libmcs/Makefile b/devel/libmcs/Makefile
index c8f3c8814ba1..3f63f51efad6 100644
--- a/devel/libmcs/Makefile
+++ b/devel/libmcs/Makefile
@@ -16,12 +16,26 @@ COMMENT=	A BSD licenced configuration database system
 
 LIB_DEPENDS=	mowgli.1:${PORTSDIR}/devel/libmowgli
 
+OPTIONS=	GCONF	"Enable gconf support"		on
+
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_GCONF)
+USE_GNOME+=	gconf2
+CONFIGURE_ARGS+=--enable-gconf
+PLIST_SUB=	GCONF=""
+.else
+CONFIGURE_ARGS+=--disable-gconf
+PLIST_SUB=	GCONF="@comment "
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} 's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/libmcs/pkg-plist b/devel/libmcs/pkg-plist
index f680c1dc0fb6..8eece0b8acb5 100644
--- a/devel/libmcs/pkg-plist
+++ b/devel/libmcs/pkg-plist
@@ -8,7 +8,7 @@ lib/libmcs.so
 lib/libmcs.so.1
 lib/libmcs.so.1.0.0
 lib/mcs/keyfile.so
-lib/mcs/gconf.so
+%%GCONF%%lib/mcs/gconf.so
 libdata/pkgconfig/libmcs.pc
 @dirrm include/libmcs
 @dirrm lib/mcs