diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 3e354bea7b82..ee12ae2289e9 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnumeric
-PORTVERSION=	1.12.18
+PORTVERSION=	1.12.21
 CATEGORIES=	math gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -44,29 +44,17 @@ PLIST_SUB=	VERSION=${PORTVERSION} \
 		GOFFICE=0.10 \
 		SHORT_VER=${PORTVERSION:R}
 
+OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	PERL GDA
 OPTIONS_DEFAULT=PERL
 GDA_DESC=	Gnome Database Access plugin
 PERL_DESC=	Support Perl as extension language
 
-.include <bsd.port.options.mk>
+PERL_USES=	perl5
+PERL_CONFIGURE_WITH=	perl
 
-.if ${PORT_OPTIONS:MPERL}
-USES+=			perl5
-PLIST_SUB+=		PERL=""
-.else
-CONFIGURE_ARGS+=	--without-perl
-PLIST_SUB+=		PERL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGDA}
-USE_GNOME+=		libgda5-ui
-CONFIGURE_ARGS+=	--with-gda
-PLIST_SUB+=		GDA=""
-.else
-CONFIGURE_ARGS+=	--without-gda
-PLIST_SUB+=		GDA="@comment "
-.endif
+GDA_CONFIGURE_WITH=	gda
+GDA_USE=	GNOME=libgda5-ui
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^GETTEXT_PACKAGE=gnumeric-$${VERSION}|GETTEXT_PACKAGE=gnumeric|g' \
diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index 39cee3a796fa..abf35bb0c1c9 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnumeric-1.12.18.tar.xz) = 402224f858cfa4e91503ab1be0491fa3322713dabe56b6eae171def8b736d9e9
-SIZE (gnome3/gnumeric-1.12.18.tar.xz) = 18064824
+SHA256 (gnome3/gnumeric-1.12.21.tar.xz) = 6eed42120babb7b2a857115f2ad6320bf255c7bd71a939344e5a6df744a09ef4
+SIZE (gnome3/gnumeric-1.12.21.tar.xz) = 18460624