Index: finance/gnucash/Makefile
===================================================================
--- finance/gnucash/Makefile
+++ finance/gnucash/Makefile
@@ -25,17 +25,12 @@
 		p5-Finance-Quote>=0:finance/p5-Finance-Quote
 
 OPTIONS_DEFINE=	AQBANKING OFX DATABASE LOCALE_TAX PYTHON GTKMM DOCS
-OPTIONS_SINGLE=	GV
-OPTIONS_SINGLE_GV=	GUILE1 GUILE2
-OPTIONS_DEFAULT=	GUILE1
 
 AQBANKING_DESC=	AqBanking support (HBCI/OpenHBCI)
 OFX_DESC=	OFX support
 DATABASE_DESC=	Enable SQL database backends
 LOCALE_TAX_DESC=	Enable localized tax categories
 GTKMM_DESC=	Enable GTKMM based UI
-GUILE1_DESC=	Use lang/guile
-GUILE2_DESC=	Use lang/guile2
 
 OPTIONS_SUB=		yes
 AQBANKING_CONFIGURE_ENABLE=aqbanking
@@ -57,13 +52,17 @@
 GTKMM_USE=		GNOME=gtkmm24
 GTKMM_CONFIGURE_ON=	--enable-gtkmm
 GTKMM_CONFIGURE_OFF=	--disable-gtkmm
-GUILE1_LIB_DEPENDS=     libguile.so:lang/guile
-GUILE1_BUILD_DEPENDS=	slib-guile>0:lang/slib-guile
-GUILE1_RUN_DEPENDS=	slib-guile>0:lang/slib-guile
-GUILE2_LIB_DEPENDS=     libguile-2.0.so:lang/guile2
-GUILE2_BUILD_DEPENDS=	slib-guile2>0:lang/slib-guile2
-GUILE2_RUN_DEPENDS=	slib-guile2>0:lang/slib-guile2
 
+FLAVORS=		guile2 guile1
+
+guile1_PKGNAMESUFFIX=	-guile1
+guile1_LIB_DEPENDS=     libguile.so:lang/guile
+guile1_BUILD_DEPENDS=	slib-guile>0:lang/slib-guile
+guile1_RUN_DEPENDS=	slib-guile>0:lang/slib-guile
+guile2_LIB_DEPENDS=     libguile-2.0.so:lang/guile2
+guile2_BUILD_DEPENDS=	slib-guile2>0:lang/slib-guile2
+guile2_RUN_DEPENDS=	slib-guile2>0:lang/slib-guile2
+
 USES=		compiler:c++11-lib desktop-file-utils gettext gmake libtool localbase \
 		perl5 pkgconfig shebangfix tar:bzip2
 USE_XORG=	x11
@@ -93,6 +92,14 @@
 		org.gnucash.warnings.gschema.xml \
 		org.gnucash.window.pages.account.tree.gschema.xml \
 		org.gnucash.window.pages.gschema.xml
+
+.if ${FLAVOR:U} == guile1
+CONFIGURE_ARGS+=	--with-guile=1.8
+PLIST_SUB+=		GUILE2="@comment "
+.else
+CONFIGURE_ARGS+=	--with-guile=2.0
+PLIST_SUB+=		GUILE2=""
+.endif
 
 .include <bsd.port.pre.mk>