diff --git a/boot/arm/beaglebone-black/MLO b/boot/arm/beaglebone-black/MLO
new file mode 100644
index 0000000..76fa9e8
Binary files /dev/null and b/boot/arm/beaglebone-black/MLO differ
diff --git a/boot/arm/beaglebone-black/README.txt b/boot/arm/beaglebone-black/README.txt
new file mode 100644
index 0000000..b8aa4ba
--- /dev/null
+++ b/boot/arm/beaglebone-black/README.txt
@@ -0,0 +1,84 @@
+Hi, welcome to Sabayon for the BeagleBone Black.
+
+First of all, you may want to install the image into a new SDHC card.
+Make sure to have enough space for it, for example, if you downloaded
+the 4GB version, make sure you're using a 4GB SDHC stick.
+
+Other requirements:
+-------------------
+
+  - a Linux distro to copy the image to the SDHC
+  - a SDHC reader
+  - a root shell on the Linux distro
+
+
+How to burn the image:
+----------------------
+
+Insert the SDHC memory into your reader (make sure that the LOCK
+switch is turned off). After a few seconds, type:
+
+  # dmesg | tail -n 10
+
+In the last kernel message lines you will be able to read the
+actual device name, might be something like "sdc" or in general
+"sdX" where X is just a letter.
+Make sure to see the same device name inside /dev directory.
+
+Once you got the name, just dump the image into that, in this
+example, we assume that the device is /dev/sdc and the image
+name is "Sabayon_Linux_8_armv7a_BeagleBoard_xM_4GB.img".
+Do this as root!
+
+  # xzcat Sabayon_Linux_8_armv7a_BeagleBoard_xM_4GB.img > /dev/sdd
+
+Once it is done, check for any error using:
+
+  # dmesg | tail -n 10
+
+And if it's all good, type:
+
+  # sync; sync; sync
+
+To make sure everything has been flushed to the device.
+
+At this point, extract your SDHC and place it into the BeagleBone Black.
+You're set!
+
+
+How to change keyboard mapping:
+-------------------------------
+
+Our images come with "keyboard-setup", a shell too that lets you easily
+do this, just type:
+
+  # keyboard-setup "<your keyboard layout code>" all
+
+Then reboot!
+
+
+How to change language:
+-----------------------
+
+Open /etc/locale.gen and add your locale (you can find a full list
+at: /usr/share/i18n/SUPPORTED).
+Make sure to add UTF-8 locales, this is what we support.
+Once you've added your line, just type:
+
+  # language-setup "<your locale, without the .UTF-8 part>" system
+
+Then reboot!
+
+
+You want to know more?
+----------------------
+Just go to http://www.sabayon.org and to http://wiki.sabayon.org
+and search for "BeagleBoard".
+We're full of guides.
+
+
+Contact
+-------
+Just mail us at website@sabayon.org if you need any help or register
+to our mailing list at http://lists.sabayon.org/cgi-bin/mailman/listinfo/devel
+
diff --git a/boot/arm/beaglebone-black/u-boot.img b/boot/arm/beaglebone-black/u-boot.img
new file mode 100644
index 0000000..14311da
Binary files /dev/null and b/boot/arm/beaglebone-black/u-boot.img differ
diff --git a/boot/arm/beaglebone-black/uEnv.txt b/boot/arm/beaglebone-black/uEnv.txt
new file mode 100644
index 0000000..809d10b
--- /dev/null
+++ b/boot/arm/beaglebone-black/uEnv.txt
@@ -0,0 +1,6 @@
+devtree=/boot/am335x-boneblack.dtb
+ramdiskfile=/boot/uInitrd
+optargs=consoleblank=0 earlyprintk=serial
+dtboot=run mmcargs; load mmc ${mmcdev}:2 ${loadaddr} ${bootfile}; load mmc ${mmcdev}:2 ${rdaddr} ${ramdiskfile}; load mmc ${mmcdev}:2 ${fdtaddr} ${devtree} ; bootm ${loadaddr} ${rdaddr} ${fdtaddr}
+uenvcmd=run dtboot
+
diff --git a/molecules/sabayon-arm-beaglebone-black-4G.spec b/molecules/sabayon-arm-beaglebone-black-4G.spec
new file mode 100644
index 0000000..2b2e0f1
--- /dev/null
+++ b/molecules/sabayon-arm-beaglebone-black-4G.spec
@@ -0,0 +1,24 @@
+%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/arm-base.common
+%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/beaglebone.common
+
+# Release desc (the actual release description)
+release_desc: armv7l BeagleBone Black
+
+# Release Version (used to generate release_file)
+%env release_version: ${SABAYON_RELEASE:-11}
+
+# Specify image file name (image file name will be automatically
+# produced otherwise)
+%env image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_armv7l_BeagleBone_Black_4GB.img
+
+# Specify the image file size in Megabytes. This is mandatory.
+# To avoid runtime failure, make sure the image is large enough to fit your
+# chroot data.
+image_mb: 3800
+
+# Path to boot partition data (MLO, u-boot.img etc)
+%env source_boot_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/boot/arm/beaglebone-black
+
+# External script that will generate the image file.
+# The same can be copied onto a MMC by using dd
+%env image_generator_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/beaglebone_image_generator_script.sh am335x-boneblack.dtb
diff --git a/scripts/iso_build.sh b/scripts/iso_build.sh
index 23b1840..60baab0 100755
--- a/scripts/iso_build.sh
+++ b/scripts/iso_build.sh
@@ -143,12 +143,14 @@ elif [ "${ACTION}" = "arm" ]; then
 
 	ARM_SOURCE_SPECS+=(
 		"sabayon-arm-beaglebone-4G.spec"
+		"sabayon-arm-beaglebone-black-4G.spec"
 		"sabayon-arm-beagleboard-xm-4G.spec"
 		"sabayon-arm-pandaboard-4G.spec"
 		"sabayon-arm-efikamx-4G.spec"
 	)
 	ARM_SOURCE_SPECS_IMG+=(
 		"${DISTRO_NAME}_${ISO_TAG}v7l_BeagleBone_4GB.img"
+		"${DISTRO_NAME}_${ISO_TAG}v7l_BeagleBone_Black_4GB.img"
 		"${DISTRO_NAME}_${ISO_TAG}_armv7a_BeagleBoard_xM_4GB.img"
 		"${DISTRO_NAME}_${ISO_TAG}_armv7a_PandaBoard_4GB.img"
 		"${DISTRO_NAME}_${ISO_TAG}_armv7a_EfikaMX_4GB.img"