diff --git a/war/plugin.jelly b/war/plugin.jelly
index a2580658..670dfdc4 100644
--- a/war/plugin.jelly
+++ b/war/plugin.jelly
@@ -190,22 +190,19 @@
     <ant:echo>Assembling webapp ${pom.artifactId}</ant:echo>
 
     <j:set var="webapp.build.lib" value="${webapp.build.webinf}/lib"/>
-    <ant:mkdir dir="${webapp.build.lib}"/>
-    
     <j:set var="webapp.build.tlds" value="${maven.war.webapp.dir}/${maven.war.tld.dir}"/>
-    <ant:mkdir dir="${webapp.build.tlds}"/>
-    
     <j:set var="webapp.build.classes" value="${webapp.build.webinf}/classes"/>
-    <ant:mkdir dir="${webapp.build.classes}"/>
 
     <j:forEach var="lib" items="${pom.artifacts}">
       <j:set var="dep" value="${lib.dependency}"/>     
       <j:if test="${dep.getProperty('war.bundle')=='true'}">
          <j:choose>
            <j:when test="${dep.type =='jar' or dep.type =='ejb' or dep.type == 'ejb-client'}"> 
+             <ant:mkdir dir="${webapp.build.lib}"/>
              <ant:copy todir="${webapp.build.lib}" file="${lib.path}"/>  
            </j:when> 
            <j:when test="${dep.type =='tld'}"> 
+             <ant:mkdir dir="${webapp.build.tlds}"/>
              <ant:copy todir="${webapp.build.tlds}" file="${lib.path}"/>  
            </j:when> 
          </j:choose>           
@@ -216,6 +213,7 @@
             DEPRECATION WARNING:            
             Use : war.bundle instead of war.bundle.jar
           </ant:echo>
+        <ant:mkdir dir="${webapp.build.lib}"/>
         <ant:copy todir="${webapp.build.lib}" file="${lib.path}"/>
       </j:if>  
       <!-- END OF TO BE REMOVED -->
@@ -227,6 +225,7 @@
     </j:forEach>            
 
     <util:available file="${maven.build.dest}">
+      <ant:mkdir dir="${webapp.build.classes}"/>
       <ant:copy todir="${webapp.build.classes}">
         <ant:fileset dir="${maven.build.dest}"
           includes="${maven.war.classes.includes}"
diff --git a/war/xdocs/changes.xml b/war/xdocs/changes.xml
index 80e9a578..3b2218a4 100644
--- a/war/xdocs/changes.xml
+++ b/war/xdocs/changes.xml
@@ -24,6 +24,7 @@
   </properties>
   <body>
     <release version="1.6.3-SNAPSHOT" date="in SVN">
+      <action dev="ltheussl" type="fix" issue="MPWAR-36">Only create tld and lib folders if corresponding dependencies are present.</action>
       <action dev="ltheussl" type="fix" issue="MPWAR-45" due-to="Kim Dykeman">war:inplace should check for maven.war.src.</action>
       <action dev="ltheussl" type="fix">
         <description>Java sources are not compiled when used with maven-test-plugin-1.8 and maven.test.skip=true.</description>
