diff --git a/bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml b/bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
index 54318af60f756f4ca21e59cc537d194ffe7b0fbd..a9dc9da566ebb15939c97c2856f4afac52dbc9c8 100755
--- a/bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
+++ b/bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
@@ -46,5 +46,5 @@
   
     <!-- NOTE: Change bbb-voice-freeswitch.xml to bbb-voice-asterisk.xml if you want to use Asterisk -->
      
-    <import resource="bbb-voice-asterisk.xml" />
+    <import resource="bbb-voice-freeswitch.xml" />
 </beans>
diff --git a/bigbluebutton-config/record/support-bbb-recording.patch b/bigbluebutton-config/record/support-bbb-recording.patch
new file mode 100755
index 0000000000000000000000000000000000000000..4d1a88bc55213adccc895f47de02cacba7e7ee2d
--- /dev/null
+++ b/bigbluebutton-config/record/support-bbb-recording.patch
@@ -0,0 +1,37 @@
+From 29dea3d414ce15d1b0088f01884f28148b1dd44b Mon Sep 17 00:00:00 2001
+From: Marco Calderon <mcmarkos86@gmail.com>
+Date: Fri, 19 Nov 2010 04:25:37 +0000
+Subject: [PATCH] support bbb recording
+
+---
+ popup.html |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+ mode change 100644 => 100755 popup.html
+
+diff --git a/popup.html b/popup.html
+old mode 100644
+new mode 100755
+index a132308..e37b9b4
+--- a/popup.html
++++ b/popup.html
+@@ -152,6 +152,9 @@ function callChanged() {
+             if (version == '0.64') {
+                 addCallConfigField('meetingToken', 'Meeting Token:', '');
+             }
++			if (version == '0.8'){
++				addCallConfigField('record', 'Recording:', 'false');
++			}
+             addCallConfigField('name', 'Meeting Name:', 'BBB Example Meeting');
+             addCallConfigField('moderatorPW', 'Moderator Password:', '123456');
+             addCallConfigField('attendeePW', 'Attendee Password:', '234567');
+@@ -400,6 +403,7 @@ function showMessage(msg, xml) {
+                 <select id="apiVersion" name="apiVersion" onchange="callChanged()" onblur="callChanged()">
+                     <option value="0.64">0.64</option>
+                     <option value="0.7">0.7</option>
++					<option value="0.8">0.8</option>
+                 </select>
+             </div>
+             <div class="field">
+-- 
+1.7.0.4
+
diff --git a/bigbluebutton-web/application.properties b/bigbluebutton-web/application.properties
index 8b2d17a5ae1f6e38b2dd28975785b376b119761e..d1e019146951da41b50ad296a3dccbe69b85c20d 100644
--- a/bigbluebutton-web/application.properties
+++ b/bigbluebutton-web/application.properties
@@ -1,8 +1,8 @@
 #utf-8
-#Sun Jun 13 21:55:54 UTC 2010
+#Fri Nov 19 02:52:11 UTC 2010
 app.version=0.70dev
 app.servlet.version=2.4
 app.grails.version=1.1.1
 plugins.hibernate=1.1.1
-plugins.jsecurity=0.4.1
 app.name=bigbluebutton
+plugins.jsecurity=0.4.1