diff --git a/record-and-playback/deploy.sh b/record-and-playback/deploy.sh
index c29dabab0465c0923b8f20a6a1feb1536115e0ef..c9dd9460e8a350652f7fd3cd023463d1cf7450e9 100755
--- a/record-and-playback/deploy.sh
+++ b/record-and-playback/deploy.sh
@@ -17,17 +17,40 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 #
-sudo cp -r core/lib/* /usr/local/bigbluebutton/core/lib/
-sudo cp -r core/scripts/* /usr/local/bigbluebutton/core/scripts/
+# Authors:
+#   Felipe Cecagno (felipe@mconf.org)
+#
+
+echo
+echo "+++++ Building record-and-playback"
+cd ~/dev/bigbluebutton/record-and-playback/
 
-PLAYBACK_LIST="slides presentation"
+sudo rm -f /usr/local/bigbluebutton/core/scripts/process/*.rb
+sudo rm -f /usr/local/bigbluebutton/core/scripts/publish/*.rb
+sudo rm -f /usr/local/bigbluebutton/core/scripts/*.yml
+sudo rm -f /usr/local/bigbluebutton/core/scripts/*.nginx
 
+sudo cp -r core/god/god/* /etc/bigbluebutton/god/
+sudo cp -r core/lib/* /usr/local/bigbluebutton/core/lib/
+sudo cp -r core/scripts/* /usr/local/bigbluebutton/core/scripts/
+#PLAYBACK_LIST="slides presentation"
+PLAYBACK_LIST="mconf"
 sudo mkdir -p /var/bigbluebutton/playback/
+sudo mkdir -p /var/bigbluebutton/recording/raw/
+sudo mkdir -p /var/bigbluebutton/recording/process/
+sudo mkdir -p /var/bigbluebutton/recording/publish/
+sudo mkdir -p /var/bigbluebutton/recording/status/recorded/
+sudo mkdir -p /var/bigbluebutton/recording/status/archived/
+sudo mkdir -p /var/bigbluebutton/recording/status/processed/
+sudo mkdir -p /var/bigbluebutton/recording/status/sanity/
+
 for PLAYBACK in $PLAYBACK_LIST
 do
-  sudo cp -r $PLAYBACK/playback/* /var/bigbluebutton/playback/
-  sudo cp -r $PLAYBACK/scripts/* /usr/local/bigbluebutton/core/scripts/
+  if [ -d $PLAYBACK/playback ]; then sudo cp -r $PLAYBACK/playback/* /var/bigbluebutton/playback/; fi
+  if [ -d $PLAYBACK/scripts ]; then sudo cp -r $PLAYBACK/scripts/* /usr/local/bigbluebutton/core/scripts/; fi
+  sudo cp -f $PLAYBACK/scripts/*-god-conf.rb /etc/bigbluebutton/god/conf/
+  sudo mkdir -p /var/log/bigbluebutton/$PLAYBACK
 done
+sudo chown -R tomcat6:tomcat6 /var/bigbluebutton/ /var/log/bigbluebutton/
+sudo cp -f /usr/local/bigbluebutton/core/scripts/*.nginx /etc/bigbluebutton/nginx/
 
-sudo chown -R tomcat6:tomcat6 /var/bigbluebutton/playback/
-sudo cp /usr/local/bigbluebutton/core/scripts/*.nginx /etc/bigbluebutton/nginx/