diff --git a/build.xml b/build.xml
index 63da752..0d78627 100755
--- a/build.xml
+++ b/build.xml
@@ -3,7 +3,7 @@
 
 Version 0.5
 
-REQUIRED INPUT PROPERTIES
+INPUT PROPERTIES
 
 This buildfile assumes that the following properties have or may have been defined in a "build.properties" file  
 in the configuration directory of the service (or else using the -D flag on the command line). 
@@ -24,7 +24,10 @@ package.<n>:			(optional) The package name of the stubs generated from WSDL and/
 etics.build:   			(optional) Set to 'true', it indicates that build structures and procedures 
 						should be optimised for remote builds in ETICS. If it is omitted, this buildfile will optimise build structures and procedures 
 						for local builds.
-              
+full.stubs:   			(optional) Set to 'false', it excludes auxiliary stub code placed under ${package}/stubs when building the stub distribution.
+						It is intended to simplify realignment of auxiliary and standard stub in IDE environments in case the latter change in non backwards-compatible ways. 
+						After re-alignment, the property is typically left to its default of 'true' to restore a joint build of all stub code. 
+           
 -->
 
 <project default="deployService" name="GCUBE Service Buildfile">
@@ -83,9 +86,10 @@ etics.build:   			(optional) Set to 'true', it indicates that build structures a
 	</if>
 	
 
+	<property name="full.stubs" value="true"/>
 	<property name="stubs.package" value="${package}.${stubs.dir.name}"/>
 	<property name="stubs.dir.name" value="stubs" /> <!-- auxiliary stub classes -->
-	<property name="stubs.dir" value="${source.dir}/${package.dir}${stubs.dir.name}" />
+	<property name="stubs.dir" value="${source.dir}/${package.dir}/${stubs.dir.name}" />
 	<available file="${stubs.dir}" property="stubs.dir.present"/>
 		
 	<!-- temporary build locations -->
@@ -429,12 +433,14 @@ etics.build:   			(optional) Set to 'true', it indicates that build structures a
 	<!-- Stub Build tasks -->
 				
 	<target name="buildStubs" depends="processWSDLs,generateStubs" description="build service stubs">
-		<if name="stubs.dir.present">
-			<copy toDir="${build.stubs.src.dir}/${package.dir}/${stubs.dir.name}" overwrite="true">
-				<fileset dir="${stubs.dir}" casesensitive="yes">
-					<exclude name="**/*.class" />
-				</fileset>
-			</copy>
+		<if name="full.stubs" value="true">
+			<if name="stubs.dir.present">
+				<copy toDir="${build.stubs.src.dir}/${package.dir}/${stubs.dir.name}" overwrite="true">
+					<fileset dir="${stubs.dir}" casesensitive="yes">
+						<exclude name="**/*.class" />
+					</fileset>
+				</copy>
+			</if>
 		</if>
 		<javac srcdir="${build.stubs.src.dir}" destdir="${build.stubs.class.dir}" debug="${java.debug}" deprecation="${java.deprecation}" description="compile stub classes">
 			<include name="**/*.java" />