diff --git a/src/packages/fff/fff-babel-bird2/Makefile b/src/packages/fff/fff-babel-bird2/Makefile
index b0591ccc..9672d18a 100644
--- a/src/packages/fff/fff-babel-bird2/Makefile
+++ b/src/packages/fff/fff-babel-bird2/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-babel-bird2
-PKG_RELEASE:=1
+PKG_RELEASE:=$(COMMITCOUNT)
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/src/packages/fff/fff-babel/Makefile b/src/packages/fff/fff-babel/Makefile
index abae858c..87bca24d 100644
--- a/src/packages/fff/fff-babel/Makefile
+++ b/src/packages/fff/fff-babel/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-babel
-PKG_RELEASE:=1
+PKG_RELEASE:=$(COMMITCOUNT)
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/src/packages/fff/fff-babel/files/lib/functions/fff/babel b/src/packages/fff/fff-babel/files/lib/functions/fff/babel
index a6fdf3b0..eb327c57 100644
--- a/src/packages/fff/fff-babel/files/lib/functions/fff/babel
+++ b/src/packages/fff/fff-babel/files/lib/functions/fff/babel
@@ -1,6 +1,6 @@
 
 implementation=$(uci -q get babelimpl.impl.impl)
-[ -z "$implementation" ] && implementation=babeld
+[ -z "$implementation" ] && implementation=bird2
 
 . /lib/functions/fff/babeldaemon/$implementation