diff --git a/build.properties b/build.properties
index ec0c487d3..332ec64c0 100644
--- a/build.properties
+++ b/build.properties
@@ -15,6 +15,6 @@ accessRightsDir=755
 accessRightsExecutable=755
 accessRightsFile=644
 
-# Extension Configuration: zip|copy
-extensionTarget=copy
+# Extension Configuration: singleZip|multiZip|copyToMain
+extensionMode=singleZip
 extensionFile=yacy_libx_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
diff --git a/build.xml b/build.xml
index 3d994d016..52c34f80e 100644
--- a/build.xml
+++ b/build.xml
@@ -127,14 +127,28 @@
                     replace="releaseNr=\1"/>
             </tokenfilter>
          </filterchain>   
-    </loadproperties> 
-	<condition property="singleExtFile">
-		<equals arg1="${extensionTarget}" arg2="copy"/>
-	</condition>	
+    </loadproperties> 	
+</target>
+	
+<!-- determining the extension target -->
+<target name="determineExtensionTarget" depends="readBuildProperties">
+	<condition property="extensionTarget" value="copy">
+	    <equals arg1="${extensionMode}" arg2="singleZip"/>
+	</condition> 
+	<condition property="extensionTarget" value="copy">
+	    <equals arg1="${extensionMode}" arg2="copyToMain"/>
+	</condition>
+	<condition property="extensionTarget" value="zip">
+	    <equals arg1="${extensionMode}" arg2="multiZip"/>
+	</condition>
+	    	
+	<condition property="singleExtFile">
+		<equals arg1="${extensionMode}" arg2="singleZip"/>
+	</condition>	  
 </target>
    
 <!-- initializing all needed variables -->    
-<target name="init" depends="readBuildProperties">
+<target name="init" depends="determineExtensionTarget">
   <mkdir dir="${build}/de/anomic/data"/>
   <mkdir dir="${build}/de/anomic/htmlFilter"/>
   <mkdir dir="${build}/de/anomic/http"/>
@@ -150,16 +164,16 @@
 
   <mkdir dir="${doc}"/>
   <mkdir dir="${data}"/>
-  <mkdir dir="${release}"/>
-
+  <mkdir dir="${release}"/>	
+	
   <filter token="REPL_DATE" value="${DSTAMP}"/>
   <filter token="REPL_RELEASE" value="${releaseFile}"/>
   <filter token="REPL_VERSION" value="${releaseVersion}" />
   <copy file="${src}/yacy.java" tofile="${build}/yacy.java" filtering="true" />
   <copy file="${doc}/Download.html" tofile="${doc}/Download.html.up" filtering="true" />
 </target>
-
-<target name="compile" depends="init" description="Compiling the yacy sources ...">
+  	
+<target name="compileMainSources" depends="init" description="Compiling the yacy sources ...">
  
   <!-- defining the classpath that should be used for compiling -->   
   <path id="project.class.path">
@@ -201,13 +215,9 @@
          debug="true" debuglevel="lines,vars,source" 
          source="${javacSource}" target="${javacTarget}"/>
 </target>
-
-<target name="all" depends="compile">
-  <delete file="${build}/yacy.java" />
-</target>
-
+	
 <!-- compiling optional content parsers and building install packages -->
-<target name="parsers" depends="compile" description="Compiling and zipping all additional parsers">
+<target name="compileParsers" depends="compileMainSources" description="Compiling and zipping all additional parsers">
   <subant target="${extensionTarget}">
     <property name="src" location="${src}"/>
     <property name="build" location="${build}"/>
@@ -222,7 +232,7 @@
 </target>
  
 <!-- compiling optional seed uploaders and building install packages -->   
-<target name="seedUploaders" depends="compile" description="Compiling and zipping additional seed uploaders">
+<target name="compileSeedUploaders" depends="compileMainSources" description="Compiling and zipping additional seed uploaders">
   <subant target="${extensionTarget}">
     <property name="src" location="${src}"/>
     <property name="build" location="${build}"/>
@@ -238,7 +248,7 @@
 </target>   
  
 <!-- compiling optional soap API and building install packages -->   
-<target name="yacySOAP" depends="compile" description="Compiling and zipping additional yacy SOAP API">
+<target name="compileSoap" depends="compileMainSources" description="Compiling and zipping additional yacy SOAP API">
   <subant target="${extensionTarget}">
     <property name="src" location="${src}"/>
     <property name="build" location="${build}"/>
@@ -252,7 +262,7 @@
   </subant>
 </target>       
    
-<target name="portForwarding" depends="compile" description="Compiling and zipping additional port forwarder"> 
+<target name="compilePortForwarding" depends="compileMainSources" description="Compiling and zipping additional port forwarder"> 
     <javac srcdir="${src}/de/anomic/server/" destdir="${build}" source="${javacSource}" target="${javacTarget}" debug="true" debuglevel="lines,vars,source">
         <include name="serverPortForwardingSch.java"/>
         <classpath>
@@ -278,7 +288,18 @@
     </copy>      
 </target>   
     
-<target name="singleExtensionFile" if="singleExtFile">
+<target name="compileExtensions" 
+	    depends="compileMainSources,compileParsers,compileSeedUploaders,compileSoap,compilePortForwarding">
+</target>	
+	
+<target name="all" depends="compileMainSources,compileExtensions">
+  <delete file="${build}/yacy.java" />
+</target>	
+	
+	<!-- ======================================================================================================= 
+		 putting all extensions together into a single zip file 
+		 ======================================================================================================= --> 	
+<target name="distExtensions" if="singleExtFile" depends="compileExtensions">
       <tar destfile="${release}/${extensionFile}" compression="gzip" defaultexcludes="yes" longfile="gnu">
         <tarfileset dir="${release}" prefix="${releaseDir}/" dirmode="${accessRightsDir}" mode="${accessRightsFile}" >
           <include name="**/*.*"/>
@@ -292,8 +313,10 @@
     <delete dir="${release}/source"/>          
 </target>   
     
-<!-- making a release file for yacy -->   
-<target name="dist" depends="all,parsers,seedUploaders,yacySOAP,portForwarding,singleExtensionFile" description="Compiling sources and make a release file ...">
+<!-- ======================================================================================================= 
+	 making a release file for yacy 
+	 ======================================================================================================= -->   
+<target name="distMain" depends="compileMainSources" description="Compiling sources and make a release file ...">
 
   <tar destfile="${release}/${releaseFile}" compression="gzip" defaultexcludes="yes" longfile="gnu">
 
@@ -401,7 +424,10 @@
   <echo message="${releaseVersion}" file="${doc}/release.txt"/>
 </target>
 
-    
+<!-- make clean -->   
+<target name="dist" depends="distMain,distExtensions">     
+</target>	
+	
 <!-- make clean -->   
 <target name="clean" description="make clean"> 
   <delete>
@@ -453,7 +479,7 @@
 </target>
 
 <!-- run a single file (selected in NetBeans4) -->
-<target name="run-single" depends="compile" description="Run Single File">
+<target name="run-single" depends="compileMainSources" description="Run Single File">
   <fail unless="classname">Must set property 'classname'</fail>
   <java classname="yacy" fork="yes">
     <classpath refid="run.classpath"/>