diff --git a/Mk/bsd.database.mk b/Mk/bsd.database.mk
index 43756161f150..21d5c95e555e 100644
--- a/Mk/bsd.database.mk
+++ b/Mk/bsd.database.mk
@@ -532,16 +532,12 @@ USE_FIREBIRD=	${WITH_FIREBIRD_VER}
 .endif
 
 .if ${USE_FIREBIRD:tl} == "yes"
-FIREBIRD_VER=	25
+FIREBIRD_VER=	${FIREBIRD_DEFAULT:S/.//}
 .else
 FIREBIRD_VER=	${USE_FIREBIRD}
 .endif
 
-.if ${FIREBIRD_VER} == "2"
-LIB_DEPENDS+=	libfbclient.so:${PORTSDIR}/databases/firebird20-client
-.elif ${FIREBIRD_VER} == "20"
-LIB_DEPENDS+=	libfbclient.so:${PORTSDIR}/databases/firebird20-client
-.elif ${FIREBIRD_VER} == "21"
+.if ${FIREBIRD_VER} == "21"
 LIB_DEPENDS+=	libfbclient.so:${PORTSDIR}/databases/firebird21-client
 .elif ${FIREBIRD_VER} == "25"
 LIB_DEPENDS+=	libfbclient.so:${PORTSDIR}/databases/firebird25-client
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 22fa364dd42c..2681fa5acb00 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -31,5 +31,6 @@ PYTHON2_DEFAULT?=	2.7
 PYTHON3_DEFAULT?=	3.3
 RUBY_DEFAULT?=		1.9
 TCLTK_DEFAULT?=		8.6
+FIREBIRD_DEFAULT?=	2.5
 
 .endif
diff --git a/UPDATING b/UPDATING
index f8b8df72a42f..8f7d66b3b13f 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,15 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20140511:
+  AFFECTS: users of databases/firebird*
+  AUTHOR: bapt@FreeBSD.org
+
+  The default version of databases/firebird* have been changed to support
+  DEFAULT_VERSIONS variable
+
+  DEFAULT_VERSIONS=firebird=2.5
+
 20140507:
   AFFECTS: users of lang/open-cobol
   AUTHOR: johans@FreeBSD.org