diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index 7d10859ca2fc..0e2863df35d8 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -26,14 +26,15 @@ USE_X_PREFIX=	yes
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui
-WANT_GNOME=	yes
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+OPTIONS=	GNOMEDB "Enable libgnomedb support" off
+
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mlibgnomedb}!=""
+.if defined(WITH_GNOMEDB)
 USE_GNOME+=		libgnomedb
 CONFIGURE_ARGS+=	--enable-gnome-db
 .else
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index a84489b270e7..ef4eb7536123 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -27,7 +27,6 @@ USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack gnomehier libgnomeprintui \
 		libgsf_gnome pygtk2 desktopfileutils
-WANT_GNOME=	yes
 USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
@@ -44,6 +43,8 @@ MAN1=		gnumeric.1 ssconvert.1 ssindex.1
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
+OPTIONS		GNOMEDB "Enable libgnomedb support" off
+
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
@@ -52,7 +53,7 @@ PLIST_SUB+=	PERL="@comment "
 PLIST_SUB+=	PERL=""
 .endif
 
-.if ${HAVE_GNOME:Mlibgnomedb}!=""
+.if defined(WITH_GNOMEDB)
 USE_GNOME+=		libgnomedb
 CONFIGURE_ARGS+=	--with-gda
 PLIST_SUB+=		GNOMEDB=""