diff --git a/molecules/awesome.common b/molecules/awesome.common
new file mode 100644
index 0000000..84935a0
--- /dev/null
+++ b/molecules/awesome.common
@@ -0,0 +1,73 @@
+# Define an alternative execution strategy, in this case, the value must be
+# "iso_remaster"
+execution_strategy: iso_remaster
+
+# Release string
+release_string: Sabayon Linux
+
+# File to write release string
+release_file: /etc/sabayon-edition
+
+# ISO Image title
+iso_title: Sabayon Awesome
+
+# Outer chroot script command, to be executed outside destination chroot before
+# before entering it (and before inner_chroot_script)
+outer_chroot_script: /sabayon/scripts/remaster_pre.sh
+
+# Execute repositories update here, in a more fault-tolerant flavor
+inner_chroot_script: /sabayon/scripts/remaster_generic_inner_chroot_script.sh
+
+# Inner chroot script command, to be executed inside destination chroot after
+# packages installation and removal
+inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh awesome
+
+# Outer chroot script command, to be executed outside destination chroot before
+# before entering it (and AFTER inner_chroot_script)
+outer_chroot_script_after: /sabayon/scripts/remaster_post.sh
+
+# Used to umount /proc and unbind packages dir
+error_script: /sabayon/scripts/remaster_error_script.sh
+
+# Extra mkisofs parameters, perhaps something to include/use your bootloader
+extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat
+
+# Pre-ISO building script. Hook to be able to copy kernel images in place, for example
+pre_iso_script: /sabayon/scripts/generic_pre_iso_script.sh Awesome
+
+# Post-ISO building script, called after ISO image generation.
+post_iso_script: /sabayon/scripts/generic_post_iso_script.sh
+
+# Destination directory for the ISO image path (MANDATORY)
+destination_iso_directory: /sabayon/iso
+
+# List of packages that would be removed from chrooted system (comma separated)
+# packages_to_remove:
+
+packages_to_add:
+	@X,
+	app-emulation/virtualbox-guest-additions,
+	app-misc/anaconda-runtime-gui,
+	app-misc/sabayon-skel,
+	app-text/pastebunz,
+	dev-python/libgnomecanvas-python,
+	lxde-base/lxdm,
+	media-fonts/corefonts,
+	media-fonts/dejavu,
+	media-gfx/feh,
+	media-fonts/ttf-bitstream-vera,
+	net-dialup/ppp,
+	net-dialup/rp-pppoe,
+	sys-power/cpufrequtils,
+	sys-apps/gpu-detector,
+	x11-apps/setxkbmap,
+	x11-apps/xhost,
+	x11-drivers/xf86-video-virtualbox,
+	x11-terms/xterm,
+	x11-themes/gtk-engines,
+	x11-themes/hicolor-icon-theme,
+	x11-wm/awesome
+
+# Determine whether repositories update should be run (if packages_to_add is set)
+# (default is: no), values are: yes, no.
+execute_repositories_update: no
diff --git a/molecules/sabayon-amd64-awesome.spec b/molecules/sabayon-amd64-awesome.spec
new file mode 100644
index 0000000..86a841c
--- /dev/null
+++ b/molecules/sabayon-amd64-awesome.spec
@@ -0,0 +1,14 @@
+# Use abs path, otherwise daily iso build won't work
+%import /sabayon/molecules/awesome.common
+
+# Release Version
+release_version: 6
+
+# Release Version string description
+release_desc: amd64 Awesome
+
+# Path to source ISO file (MANDATORY)
+source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso
+
+# Destination ISO image name, call whatever you want.iso, not mandatory
+destination_iso_image_name: Sabayon_Linux_6_amd64_Awesome.iso
diff --git a/molecules/sabayon-x86-awesome.spec b/molecules/sabayon-x86-awesome.spec
new file mode 100644
index 0000000..76707bc
--- /dev/null
+++ b/molecules/sabayon-x86-awesome.spec
@@ -0,0 +1,16 @@
+# Use abs path, otherwise daily iso build won't work
+%import /sabayon/molecules/awesome.common
+
+prechroot: linux32
+
+# Release Version
+release_version: 6
+
+# Release Version string description
+release_desc: x86 Awesome
+
+# Path to source ISO file (MANDATORY)
+source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso
+
+# Destination ISO image name, call whatever you want.iso, not mandatory
+destination_iso_image_name: Sabayon_Linux_6_x86_Awesome.iso
diff --git a/scripts/remaster_generic_inner_chroot_script_after.sh b/scripts/remaster_generic_inner_chroot_script_after.sh
index 3e1dbb4..41878e7 100755
--- a/scripts/remaster_generic_inner_chroot_script_after.sh
+++ b/scripts/remaster_generic_inner_chroot_script_after.sh
@@ -237,6 +237,15 @@ elif [ "$1" = "kde" ]; then
 	setup_sabayon_mce
 	setup_cpufrequtils
 	has_proprietary_drivers && setup_proprietary_gfx_drivers || setup_oss_gfx_drivers
+elif [ "$1" = "awesome" ]; then
+	setup_networkmanager
+	# Fix ~/.dmrc to have it load Awesome
+	echo "[Desktop]" > /etc/skel/.dmrc
+	echo "Session=awesome" >> /etc/skel/.dmrc
+	remove_desktop_files
+	setup_displaymanager
+	setup_cpufrequtils
+	has_proprietary_drivers && setup_proprietary_gfx_drivers || setup_oss_gfx_drivers
 fi
 
 # !!! THERE IS A BUG IN THE CLAMAV EBUILD !!!