diff --git a/bigbluebutton-client/.gitignore b/bigbluebutton-client/.gitignore
index fd8170890ac380bc2cb84bfa5a8dab5c20403ca7..e1e5d69617440cc74b7a2427ed7b5d37e86a1a09 100755
--- a/bigbluebutton-client/.gitignore
+++ b/bigbluebutton-client/.gitignore
@@ -6,6 +6,7 @@ linker-report.xml
 bundles.txt
 build/
 bin/
+client/
 bbbResources.properties.*
 asdoc/
 hs_err_pid*
diff --git a/bigbluebutton-client/build.xml b/bigbluebutton-client/build.xml
index a693f0604fe270c2f24eb74e2bf171bfafd5f240..f221e022053774ee8b09267862acb5934a06fd7e 100755
--- a/bigbluebutton-client/build.xml
+++ b/bigbluebutton-client/build.xml
@@ -487,18 +487,22 @@
 		<echo message="Done Generating ASDocs" />
 	</target>
 
-	<target name="clean">
-		<delete>
-			<fileset dir="${OUTPUT_DIR}" >
-		  		<exclude name="locale/*.swf"/>
-		  		<exclude name=".gitignore"/>
-			</fileset>
-			<dirset dir="${OUTPUT_DIR}">
-		  		<include name="**/*"/>
-		  		<exclude name=".gitignore"/>
-		  		<exclude name="locale"/>
-			</dirset>
-  		</delete>
+	<target name="clean" depends="init-ant-contrib">
+                <if>
+                <equals arg1="${OUTPUT_DIR}" arg2="true"/>
+                <then>
+			<echo message="Locale output dir exists. Deleting contents of ${OUTPUT_DIR}/locale"/>
+			<delete>
+				<fileset dir="${OUTPUT_DIR}">
+					<include name="**/*"/>
+				</fileset>
+			</delete>
+                </then>
+                <else>
+			<echo message="Output dir does not exists. Creating [${OUTPUT_DIR}] dir."/>
+			<mkdir dir="${OUTPUT_DIR}"/>
+                </else>
+        	</if>
 	</target>
 
 	<!-- NOTE: compile-deskshare-standalone MUST come first before compile-bbb as we need the deskshare-standalone