diff --git a/molecules/3rdparty/mcs.common b/molecules/3rdparty/mcs.common
index fa282d3..8d429b5 100644
--- a/molecules/3rdparty/mcs.common
+++ b/molecules/3rdparty/mcs.common
@@ -11,6 +11,7 @@ release_file: /etc/sabayon-edition
 # ISO Image title
 iso_title: Sabayon MCS
 
+
 # Outer chroot script command, to be executed outside destination chroot before
 # before entering it (and before inner_chroot_script)
 outer_chroot_script: /sabayon/scripts/3rdparty/remaster_mcs_pre.sh
@@ -26,6 +27,9 @@ inner_chroot_script_after: /sabayon/scripts/3rdparty/remaster_mcs_inner_chroot_s
 # before entering it (and AFTER inner_chroot_script)
 outer_chroot_script_after: /sabayon/scripts/remaster_post.sh
 
+# Used to umount /proc
+error_script: /sabayon/scripts/3rdparty/error_script_mcs.sh
+
 # Extra mkisofs parameters, perhaps something to include/use your bootloader
 extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat
 
@@ -169,12 +173,14 @@ packages_to_add:
 	app-admin/389-console,
 	net-nds/389-admin,
 	net-mail/dovecot,
-	mail-mta/postfix,
 	net-mail/cyrus-imapd,
 	www-servers/apache[threads],
 	www-servers/jboss-bin:4.2,
 	net-mail/gnarwl,
-	dev-java/log4j
+	dev-java/log4j,
+	dev-lang/erlang,
+	net-im/jabber-base,
+	net-im/ejabberd-babel
 
 # Custom shell call to packages add (default is: equo install)
 custom_packages_add_cmd: equo install --relaxed
diff --git a/remaster/mcs/mcs-oemsystem-default b/remaster/mcs/mcs-oemsystem-default
index db2d71c..fe68421 100644
--- a/remaster/mcs/mcs-oemsystem-default
+++ b/remaster/mcs/mcs-oemsystem-default
@@ -11,7 +11,7 @@ depend() {
 	need net
 	use dns
 	before 389-ds 389-ds-snmp 389-admin
-	before mysql jboss-bin-4.2 postfix
+	before mysql jboss-bin-4.2 postfix ejabberd
 }
 
 start() {
diff --git a/scripts/3rdparty/error_script_mcs.sh b/scripts/3rdparty/error_script_mcs.sh
new file mode 100755
index 0000000..281a80e
--- /dev/null
+++ b/scripts/3rdparty/error_script_mcs.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+if [ -d "${CHROOT_DIR}" ]; then
+	umount "${CHROOT_DIR}/proc"
+fi
diff --git a/scripts/3rdparty/remaster_mcs_inner_chroot_script_after.sh b/scripts/3rdparty/remaster_mcs_inner_chroot_script_after.sh
index a110286..bc05120 100755
--- a/scripts/3rdparty/remaster_mcs_inner_chroot_script_after.sh
+++ b/scripts/3rdparty/remaster_mcs_inner_chroot_script_after.sh
@@ -54,8 +54,6 @@ echo "Setting up mysql"
 /etc/init.d/mysql start --nodeps || exit 1
 mysql -u root --password=mcsmanager -h localhost < /.mcs/mwsql.sql
 mysql -u root --password=mcsmanager -h localhost < /.mcs/bedework.sql
-# TODO setup user permissions?
-# TODO do not ask password
 /etc/init.d/mysql stop --nodeps
 
 # setup 389-console data
@@ -93,10 +91,6 @@ cp /.mcs/scripts/mcs-ldapinit.pl /usr/sbin/ || exit 1
 chmod +x /usr/sbin/mcs-ldapinit.pl || exit 1
 chown root:root /usr/sbin/mcs-ldapinit.pl || exit 1
 
-# Build ejabberd
-#tar xvzf /.mcs/ejabberd-patched.tar.bz2 -C /tmp || exit 1
-#cd /tmp/ejabberd-2.1.0_rc1 || exit 1
-
 ## Setup MCS
 
 # copy jboss data over
@@ -129,6 +123,7 @@ rc-update add jboss-bin-4.2 default
 rc-update add mysql default
 rc-update add dovecot default
 rc-update add postfix default
+rc-update add ejabberd default
 
 # remove unused services from init
 rc-update del sabayon-mce default