diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index 1fb7418565499fc1085e824d7141b69471bca72f..c23e1fcb67be961119a7874a70969d1dda158c76 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -109,14 +109,14 @@
             </antpublisher>
             <htmlemail
                 logdir="${env.LOG_DIR}/${project.name}">
-                <failure address="david_williams@us.ibm.com" reportWhenFixed="true" />
-                <failure address="hjzhang@ca.ibm.com" reportWhenFixed="true" />
-                <failure address="nitind@us.ibm.com" reportWhenFixed="true" />
-                <failure address="arvera@ca.ibm.com" reportWhenFixed="true" />
-                <failure address="neil.hauge@oracle.com" reportWhenFixed="true" />
-                <failure address="tran.le@oracle.com" reportWhenFixed="true" />
-                <failure address="raghunathan.srinivasan@oracle.com" reportWhenFixed="true" />
-                <failure address="nsandona@us.ibm.com" reportWhenFixed="true" />
+                <failure address="david_williams" reportWhenFixed="true" />
+                <failure address="hzhang" reportWhenFixed="true" />
+                <failure address="nitind" reportWhenFixed="true" />
+                <failure address="arvera" reportWhenFixed="true" />
+                <failure address="nhauge" reportWhenFixed="true" />
+                <failure address="tle" reportWhenFixed="true" />
+                <failure address="rsrinivasan" reportWhenFixed="true" />
+                <failure address="nsandonato" reportWhenFixed="true" />
                 <propertiesmapper
                     file="${env.EMAIL_PROPERTIES}" />
             </htmlemail>
@@ -427,7 +427,7 @@
                     value="S"/>
                 <property
                     name="buildId"
-                    value="3.1M3"/>
+                    value="3.1M4"/>
                 <property
                     name="buildBranch"
                     value="R3.1"/>