diff --git a/boot/arm/raspberry/bootcode.bin b/boot/arm/raspberry/bootcode.bin
new file mode 100644
index 0000000..90d1659
Binary files /dev/null and b/boot/arm/raspberry/bootcode.bin differ
diff --git a/boot/arm/raspberry/cmdline.txt b/boot/arm/raspberry/cmdline.txt
new file mode 100644
index 0000000..e8192e0
--- /dev/null
+++ b/boot/arm/raspberry/cmdline.txt
@@ -0,0 +1 @@
+console=ttyAMA0,115200 root=/dev/mmcblk0p2 rootwait
diff --git a/boot/arm/raspberry/config.txt b/boot/arm/raspberry/config.txt
new file mode 100644
index 0000000..0482794
--- /dev/null
+++ b/boot/arm/raspberry/config.txt
@@ -0,0 +1 @@
+kernel=uImage
diff --git a/boot/arm/raspberry/fixup.dat b/boot/arm/raspberry/fixup.dat
new file mode 100644
index 0000000..d9cb80d
Binary files /dev/null and b/boot/arm/raspberry/fixup.dat differ
diff --git a/boot/arm/raspberry/fixup_cd.dat b/boot/arm/raspberry/fixup_cd.dat
new file mode 100644
index 0000000..9a4dee3
Binary files /dev/null and b/boot/arm/raspberry/fixup_cd.dat differ
diff --git a/boot/arm/raspberry/start.elf b/boot/arm/raspberry/start.elf
new file mode 100644
index 0000000..59c022d
Binary files /dev/null and b/boot/arm/raspberry/start.elf differ
diff --git a/boot/arm/raspberry/start_cd.elf b/boot/arm/raspberry/start_cd.elf
new file mode 100644
index 0000000..847fd1c
Binary files /dev/null and b/boot/arm/raspberry/start_cd.elf differ
diff --git a/molecules/armv6-base.common b/molecules/armv6-base.common
new file mode 100644
index 0000000..7d6e099
--- /dev/null
+++ b/molecules/armv6-base.common
@@ -0,0 +1,4 @@
+%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/arm-base.common
+
+# Path to source chroot (mandatory)
+%env source_chroot: ${SABAYON_MOLECULE_HOME:-/sabayon}/sources/armv6l_core-2013
diff --git a/molecules/raspberry.common b/molecules/raspberry.common
new file mode 100644
index 0000000..b7c4d72
--- /dev/null
+++ b/molecules/raspberry.common
@@ -0,0 +1,12 @@
+# List of packages to add on the BeagleBoard xM
+packages_to_add:
+	app-admin/eselect-uimage,
+	app-misc/sabayon-live,
+	app-misc/sabayon-skel,
+	net-misc/ntp,
+	sys-apps/keyboard-configuration-helpers,
+	sys-kernel/linux-raspberry,
+	sys-process/vixie-cron
+
+# List of packages to remove from the BeagleBoard xM image
+packages_to_remove:
diff --git a/molecules/sabayon-arm-raspberry-4G.spec b/molecules/sabayon-arm-raspberry-4G.spec
new file mode 100644
index 0000000..dba12ec
--- /dev/null
+++ b/molecules/sabayon-arm-raspberry-4G.spec
@@ -0,0 +1,24 @@
+%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/armv6-base.common
+%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/raspberry.common
+
+# Release desc (the actual release description)
+release_desc: armv6l Raspberry Pi
+
+# 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}_armv6l_Raspberry_Pi_Base_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/raspberry
+
+# 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/raspberry_image_generator_script.sh
diff --git a/scripts/mkloopcard_raspberry_chroot_hook.sh b/scripts/mkloopcard_raspberry_chroot_hook.sh
new file mode 100755
index 0000000..d633746
--- /dev/null
+++ b/scripts/mkloopcard_raspberry_chroot_hook.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+/usr/sbin/env-update
+. /etc/profile
+
+. /mkloopcard_chroot.include || exit 1
+
+setup_boot
+setup_users
+
+exit 0
diff --git a/scripts/raspberry_image_generator_script.sh b/scripts/raspberry_image_generator_script.sh
new file mode 100755
index 0000000..bc84eb3
--- /dev/null
+++ b/scripts/raspberry_image_generator_script.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# Path to molecules.git dir
+SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
+export SABAYON_MOLECULE_HOME
+
+# Get dtb files from argv
+export DTB_FILES="${1}"
+shift
+
+# sigh vfat
+export BOOT_PART_TYPE_INSIDE_ROOT="1"
+
+exec "${SABAYON_MOLECULE_HOME}"/scripts/mkloopcard.sh "${SABAYON_MOLECULE_HOME}"/scripts/mkloopcard_raspberry_chroot_hook.sh "${@}"