diff --git a/build/build-usage.xml b/build/build-usage.xml
index 9f612f39cc8..9940f46edb3 100644
--- a/build/build-usage.xml
+++ b/build/build-usage.xml
@@ -41,7 +41,7 @@
     <compile-java jar.name="${usage.jar}" top.dir="${usage.dir}" classpath="usage.classpath" />
   </target>
 
-  <target name="build-usage" depends="build-all, compile-usage">
+  <target name="build-usage" depends="compile-usage">
     <mkdir dir="${usage.dist.dir}/conf" />
 
     <copy overwrite="true" todir="${usage.dist.dir}/lib">
@@ -51,14 +51,14 @@
     </copy>
   </target>
 
-  <target name="run-usage" depends="build-usage">
+  <target name="run-usage" depends="build-usage, deploy-usage">
     <java classname="com.cloud.usage.UsageServer" fork="true">
         <classpath refid="usage.classpath"/>
     	<jvmarg value="-Dpid=${pid}"/>
     </java>
   </target>	
 	
-    <target name="debug-usage" depends="build-usage">
+    <target name="debug-usage" depends="build-usage, deploy-usage">
     	<java classname="com.cloud.usage.UsageServer" fork="true">
 	        <classpath refid="usage.classpath"/>
 	        <jvmarg value="-Dpid=${pid}"/>
diff --git a/build/developer.xml b/build/developer.xml
index f2e5aa6463e..e145d04df53 100755
--- a/build/developer.xml
+++ b/build/developer.xml
@@ -37,6 +37,7 @@
   <property name="unittest.jar.dir" location="${unittest.dir}/jar"/>
   <property name="unittest.formatter" value="plain" />
   <property name="ovm.dir" location="${base.dir}/ovm" />
+  <property name="usage.dir" location="${base.dir}/usage" />	
   
   <!-- directories for api doc -->
   <property name="api.docs.dir" location="${dist.dir}/apidocs" />
@@ -149,7 +150,7 @@
     <delete dir="${tomcat.home}/logs" />
     <delete quiet="false" >
       <fileset dir="${tomcat.home}/conf" >
-      	<include name="**/component*.xml" />
+      	<include name="**/*component*.xml" />
       </fileset>
     </delete>
   </target>
@@ -216,16 +217,12 @@
       <available file="${deploy.work.dir}/usage.zip" type="file" />
     </condition>
     <antcall target="unzip-usage" inheritAll="true" />
-    <copy todir="${server.deploy.to.dir}/bin">
-      <fileset dir="${deploy.work.dir}/usage/bin/">
-        <include name="*.sh"/>
-      </fileset>
-    </copy>
     <copy overwrite="true" todir="${server.deploy.to.dir}/conf">
-      <fileset dir="${deploy.work.dir}/usage/conf/">
-        <include name="**/*"/>
+      <fileset dir="${usage.dir}/conf/">
+        <include name="*.in" />
       </fileset>
-    </copy>
+      <globmapper from="*.in" to="*" />
+    </copy>  	
     <copy overwrite="true" todir="${server.deploy.to.dir}/webapps/client/WEB-INF/lib">
       <fileset dir="${deploy.work.dir}/usage/lib/">
         <include name="**/*.jar"/>