diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index 49d675fc7053f0deb87fb90b1c53e4c7cf004848..9a35078c5e8bfa53ec01319f3a2d72de15e81088 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -126,10 +126,6 @@
             especially since the ant default antpublisher will
             result in error, if an ant build hasn't ran! -->
         <publishers>
-            <antpublisher>
-            </antpublisher>
-            <htmlemail>
-            </htmlemail>
         </publishers>
     </project>
     <project
@@ -272,7 +268,31 @@
             quietperiod="120">
             <cvs
                 tag="R2_0_maintenance"
-                module="${env.RELENGMAPS}"
+                module="${env.RELENGCOMMON}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                tag="R2_0_maintenance"
+                module="${env.RELENGEJBTOOLS}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                tag="R2_0_maintenance"
+                module="${env.RELENGJEETOOLS}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                tag="R2_0_maintenance"
+                module="${env.RELENGSERVERTOOLS}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                tag="R2_0_maintenance"
+                module="${env.RELENGSOURCEEDITING}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                tag="R2_0_maintenance"
+                module="${env.RELENGWEBSERVICES}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                tag="R2_0_maintenance"
+                module="${env.RELENG}"
                 reallyquiet="${env.CVS_QUIET}" />
             <cvs
                 tag="R1_0_maintenance"
@@ -320,7 +340,31 @@
             quietperiod="120">
             <cvs
                 tag="R2_0_maintenance"
-                module="${env.RELENGMAPS}"
+                module="${env.RELENGCOMMON}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                tag="R2_0_maintenance"
+                module="${env.RELENGEJBTOOLS}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                tag="R2_0_maintenance"
+                module="${env.RELENGJEETOOLS}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                tag="R2_0_maintenance"
+                module="${env.RELENGSERVERTOOLS}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                tag="R2_0_maintenance"
+                module="${env.RELENGSOURCEEDITING}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                tag="R2_0_maintenance"
+                module="${env.RELENGWEBSERVICES}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                tag="R2_0_maintenance"
+                module="${env.RELENG}"
                 reallyquiet="${env.CVS_QUIET}" />
             <cvs
                 tag="R1_0_maintenance"
@@ -368,8 +412,33 @@
             quietperiod="120">
             <cvs
                 tag="R2_0_2_patches"
-                module="${env.RELENGMAPS}"
+                module="${env.RELENG}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                tag="R2_0_2_patches"
+                module="${env.RELENGCOMMON}"
                 reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                tag="R2_0_2_patches"
+                module="${env.RELENGEJBTOOLS}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                tag="R2_0_2_patches"
+                module="${env.RELENGJEETOOLS}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                tag="R2_0_2_patches"
+                module="${env.RELENGSERVERTOOLS}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                tag="R2_0_2_patches"
+                module="${env.RELENGSOURCEEDITING}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                tag="R2_0_2_patches"
+                module="${env.RELENGWEBSERVICES}"
+                reallyquiet="${env.CVS_QUIET}" />
+
             <cvs
                 tag="R1_0_2_patches"
                 module="${env.RELENGDALI}"
@@ -435,7 +504,27 @@
     
     <project name="wtp-R3.0-S">
         <modificationset quietperiod="120">
-            <cvs module="${env.RELENGMAPS}" reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                module="${env.RELENG}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                module="${env.RELENGCOMMON}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                module="${env.RELENGEJBTOOLS}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                module="${env.RELENGJEETOOLS}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                module="${env.RELENGSERVERTOOLS}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                module="${env.RELENGSOURCEEDITING}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                module="${env.RELENGWEBSERVICES}"
+                reallyquiet="${env.CVS_QUIET}" />
             <cvs module="${env.RELENGJSF}" reallyquiet="${env.CVS_QUIET}" />
             <cvs module="${env.RELENGDALI}" reallyquiet="${env.CVS_QUIET}" />
         </modificationset>
@@ -455,7 +544,25 @@
         <modificationset
             quietperiod="120">
             <cvs
-                module="${env.RELENGMAPS}"
+                module="${env.RELENG}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                module="${env.RELENGCOMMON}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                module="${env.RELENGEJBTOOLS}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                module="${env.RELENGJEETOOLS}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                module="${env.RELENGSERVERTOOLS}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                module="${env.RELENGSOURCEEDITING}"
+                reallyquiet="${env.CVS_QUIET}" />
+            <cvs
+                module="${env.RELENGWEBSERVICES}"
                 reallyquiet="${env.CVS_QUIET}" />
             <cvs
                 module="${env.RELENGJSF}"
diff --git a/releng.control/commonComputedVariables.shsource b/releng.control/commonComputedVariables.shsource
index 5126aed91741b7072a6d4a4604bf0a9fa9146332..72974348ff543cbc23e515f92c9533c16cea96df 100644
--- a/releng.control/commonComputedVariables.shsource
+++ b/releng.control/commonComputedVariables.shsource
@@ -45,6 +45,12 @@ export RELENGMAPS=webtools.maps
 export RELENGJSF=webtools.maps/releng.jsf
 export RELENGDALI=webtools.maps/releng.dali
 export RELENGINCUBATOR=webtools.maps/releng.incubator
+export RELENGCOMMON=webtools.maps/releng.common
+export RELENGEJBTOOLS=webtools.maps/releng.ejbtools
+export RELENGJEETOOLS=webtools.maps/releng.jeetools
+export RELENGSERVERTOOLS=webtools.maps/releng.servertools
+export RELENGSOURCEEDITING=webtools.maps/releng.sourceediting
+export RELENGWEBSERVICES=webtools.maps/releng.webservices
 
 # for now, always use Java 5 as native "home", but
 # scripts and paths may still use java 1.4