diff --git a/molecules/beagleboard-xm.common b/molecules/beagleboard-xm.common
index c3cd2a2..6f56d40 100644
--- a/molecules/beagleboard-xm.common
+++ b/molecules/beagleboard-xm.common
@@ -1,6 +1,7 @@
 # List of packages to add on the BeagleBoard xM
 packages_to_add:
 	lxde-base/lxdm,
+	sys-kernel/linux-beagle,
 	x11-base/xorg-server,
 	x11-drivers/xf86-video-omapfb
 
diff --git a/molecules/beaglebone.common b/molecules/beaglebone.common
new file mode 100644
index 0000000..51293dc
--- /dev/null
+++ b/molecules/beaglebone.common
@@ -0,0 +1,6 @@
+# List of packages to add on the BeagleBoard xM
+packages_to_add:
+	sys-kernel/linux-beaglebone
+
+# List of packages to remove from the BeagleBoard xM image
+packages_to_remove:
diff --git a/molecules/sabayon-arm-beaglebone-base-16G.spec b/molecules/sabayon-arm-beaglebone-base-16G.spec
index a399e4c..a67d993 100644
--- a/molecules/sabayon-arm-beaglebone-base-16G.spec
+++ b/molecules/sabayon-arm-beaglebone-base-16G.spec
@@ -1,7 +1,8 @@
 %import /sabayon/molecules/arm-base.common
+%import /sabayon/molecules/beaglebone.common
 
 # Release desc (the actual release description)
-release_desc: armv7a BeagleBone Base
+release_desc: armv7a BeagleBone
 
 # Release Version (used to generate release_file)
 release_version: 8
diff --git a/molecules/sabayon-arm-beaglebone-base-4G.spec b/molecules/sabayon-arm-beaglebone-base-4G.spec
index f46a59f..3be623a 100644
--- a/molecules/sabayon-arm-beaglebone-base-4G.spec
+++ b/molecules/sabayon-arm-beaglebone-base-4G.spec
@@ -1,7 +1,8 @@
 %import /sabayon/molecules/arm-base.common
+%import /sabayon/molecules/beaglebone.common
 
 # Release desc (the actual release description)
-release_desc: armv7a BeagleBone Base
+release_desc: armv7a BeagleBone
 
 # Release Version (used to generate release_file)
 release_version: 8
diff --git a/molecules/sabayon-arm-beaglebone-base-8G.spec b/molecules/sabayon-arm-beaglebone-base-8G.spec
index c3efa69..12240e2 100644
--- a/molecules/sabayon-arm-beaglebone-base-8G.spec
+++ b/molecules/sabayon-arm-beaglebone-base-8G.spec
@@ -1,7 +1,8 @@
 %import /sabayon/molecules/arm-base.common
+%import /sabayon/molecules/beaglebone.common
 
 # Release desc (the actual release description)
-release_desc: armv7a BeagleBone Base
+release_desc: armv7a BeagleBone
 
 # Release Version (used to generate release_file)
 release_version: 8
diff --git a/scripts/mkloopcard_beagleboard_xm_chroot_hook.sh b/scripts/mkloopcard_beagleboard_xm_chroot_hook.sh
index 625e137..b9bc388 100755
--- a/scripts/mkloopcard_beagleboard_xm_chroot_hook.sh
+++ b/scripts/mkloopcard_beagleboard_xm_chroot_hook.sh
@@ -9,11 +9,7 @@ env-update
 # enable sshd by default
 rc-update add sshd default
 
-# TODO: error out here when linux-beaglebone is there
-# "equo update" is done by inner_source_chroot_update script
-# which directive is appended by iso_build.sh script
-equo install sys-kernel/linux-beagle
-
+# select the first available kernel
 eselect uimage set 1
 
 # setup root password to... root!
@@ -21,8 +17,8 @@ echo root:root | chpasswd
 # cleaning up deps
 rc-update --update
 
-# setup serial console
-sed -i "s;s0:.*;s0:12345:respawn:/sbin/agetty 115200 ttyO2 vt100;" /etc/inittab || exit 1
+# setup serial login
+echo "s0:12345:respawn:/sbin/agetty 115200 ttyO2 vt100" >> /etc/inittab
 
 exit 0
 
diff --git a/scripts/mkloopcard_beaglebone_chroot_hook.sh b/scripts/mkloopcard_beaglebone_chroot_hook.sh
index 5a62562..1043bb0 100755
--- a/scripts/mkloopcard_beaglebone_chroot_hook.sh
+++ b/scripts/mkloopcard_beaglebone_chroot_hook.sh
@@ -9,11 +9,7 @@ env-update
 # enable sshd by default
 rc-update add sshd default
 
-# TODO: error out here when linux-beaglebone is there
-# "equo update" is done by inner_source_chroot_update script
-# which directive is appended by iso_build.sh script
-equo install sys-kernel/linux-beaglebone
-
+# select the first available kernel
 eselect uimage set 1
 
 # setup root password to... root!
@@ -21,5 +17,8 @@ echo root:root | chpasswd
 # cleaning up deps
 rc-update --update
 
+# Setup serial login
+echo "s0:12345:respawn:/sbin/agetty 115200 ttyO0 vt100" >> /etc/inittab
+
 exit 0