Index: Makefile
===================================================================
--- Makefile	(revision 308677)
+++ Makefile	(working copy)
@@ -50,12 +50,13 @@
 CONFLICTS_INSTALL=	asterisk*-1.4* asterisk*-1.6* asterisk*-10*
 
 OPTIONS_DEFINE=	VORBIS PGSQL MYSQL RADIUS SNMP H323 FREETDS JABBER SQLITE GSM \
-		CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP ODBC OOH323
-OPTIONS_DEFAULT=	VORBIS ODBC UNIXODBC PGSQL RADIUS SNMP H323 FREETDS JABBER GSM \
+		CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323
+OPTIONS_DEFAULT=	VORBIS UNIXODBC PGSQL RADIUS SNMP H323 FREETDS JABBER GSM \
 		SQLITE CURL
 
-OPTIONS_SINGLE=	ODBC
-OPTIONS_SINGLE_ODBC=	IODBC UNIXODBC
+OPTIONS_RADIO=	ODBC
+OPTIONS_RADIO_ODBC=	IODBC UNIXODBC
+
 OPTIONS_DEFINE_i386=	DAHDI
 OPTIONS_DEFINE_amd64=	DAHDI
 OPTIONS_DEFINE_sparc64=	DAHDI