diff --git a/changelog/project.xml b/changelog/project.xml
index 919dee52..f2f34b8d 100644
--- a/changelog/project.xml
+++ b/changelog/project.xml
@@ -38,8 +38,8 @@
     <developer>
       <name>Emmanuel Venisse</name>
       <id>evenisse</id>
-      <email>evenisse@ifrance.com</email>
-      <organization>Fi System</organization>
+      <email>emmanuel@venisse.net</email>
+      <organization/>
       <roles>
         <role>Java Developer</role>
       </roles>
diff --git a/checkstyle/project.xml b/checkstyle/project.xml
index 2feedc50..b52869eb 100644
--- a/checkstyle/project.xml
+++ b/checkstyle/project.xml
@@ -59,8 +59,8 @@
     <developer>
       <name>Emmanuel Venisse</name>
       <id>evenisse</id>
-      <email>evenisse@ifrance.com</email>
-      <organization>Fi System</organization>
+      <email>emmanuel@venisse.net</email>
+      <organization/>
       <roles>
         <role>Java Developer</role>
       </roles>
diff --git a/clover/project.xml b/clover/project.xml
index 58018e7a..f3816c4d 100644
--- a/clover/project.xml
+++ b/clover/project.xml
@@ -61,8 +61,8 @@
     <developer>
       <name>Emmanuel Venisse</name>
       <id>evenisse</id>
-      <email>evenisse@ifrance.com</email>
-      <organization>Fi System</organization>
+      <email>emmanuel@venisse.net</email>
+      <organization/>
       <roles>
         <role>Java Developer</role>
       </roles>
diff --git a/developer-activity/project.xml b/developer-activity/project.xml
index aafde62c..d24c12f9 100644
--- a/developer-activity/project.xml
+++ b/developer-activity/project.xml
@@ -18,8 +18,8 @@
     <developer>
       <name>Emmanuel Venisse</name>
       <id>evenisse</id>
-      <email>evenisse@ifrance.com</email>
-      <organization>Fi System</organization>
+      <email>emmanuel@venisse.net</email>
+      <organization/>
       <roles>
         <role>Java Developer</role>
       </roles>
diff --git a/eclipse/project.xml b/eclipse/project.xml
index 6bd1a461..e1d01c53 100644
--- a/eclipse/project.xml
+++ b/eclipse/project.xml
@@ -36,8 +36,8 @@
     <developer>
       <name>Emmanuel Venisse</name>
       <id>evenisse</id>
-      <email>evenisse@ifrance.com</email>
-      <organization>Fi System</organization>
+      <email>emmanuel@venisse.net</email>
+      <organization/>
       <roles>
         <role>Java Developer</role>
       </roles>
diff --git a/file-activity/project.xml b/file-activity/project.xml
index fdf69a2a..aceae3ac 100644
--- a/file-activity/project.xml
+++ b/file-activity/project.xml
@@ -41,8 +41,8 @@
     <developer>
       <name>Emmanuel Venisse</name>
       <id>evenisse</id>
-      <email>evenisse@ifrance.com</email>
-      <organization>Fi System</organization>
+      <email>emmanuel@venisse.net</email>
+      <organization/>
       <roles>
         <role>Java Developer</role>
       </roles>
diff --git a/genapp/project.xml b/genapp/project.xml
index dd773d19..2f8358ac 100644
--- a/genapp/project.xml
+++ b/genapp/project.xml
@@ -28,8 +28,8 @@
     <developer>
       <name>Emmanuel Venisse</name>
       <id>evenisse</id>
-      <email>evenisse@ifrance.com</email>
-      <organization>Fi System</organization>
+      <email>emmanuel@venisse.net</email>
+      <organization/>
       <roles>
         <role>Java Developer</role>
       </roles>
diff --git a/javadoc/project.xml b/javadoc/project.xml
index 8090f245..856527c2 100644
--- a/javadoc/project.xml
+++ b/javadoc/project.xml
@@ -18,8 +18,8 @@
     <developer>
       <name>Emmanuel Venisse</name>
       <id>evenisse</id>
-      <email>evenisse@ifrance.com</email>
-      <organization>Fi System</organization>
+      <email>emmanuel@venisse.net</email>
+      <organization/>
       <roles>
         <role>Java Developer</role>
       </roles>
diff --git a/jbuilder/project.xml b/jbuilder/project.xml
index c0b9ebc3..0f7ab663 100644
--- a/jbuilder/project.xml
+++ b/jbuilder/project.xml
@@ -27,7 +27,7 @@
     <developer>
       <name>Emmanuel Venisse</name>
       <id>evenisse</id>
-      <email>evenisse@ifrance.com</email>
+      <email>emmanuel@venisse.net</email>
       <organization/>
       <roles>
         <role>Java Developer</role>
diff --git a/jcoverage/project.xml b/jcoverage/project.xml
index 7aeccb63..761c2f20 100644
--- a/jcoverage/project.xml
+++ b/jcoverage/project.xml
@@ -38,8 +38,8 @@
     <developer>
       <name>Emmanuel Venisse</name>
       <id>evenisse</id>
-      <email>evenisse@ifrance.com</email>
-      <organization></organization>
+      <email>emmanuel@venisse.net</email>
+      <organization/>
       <roles>
         <role>Java Developer</role>
       </roles>
diff --git a/jdepend/project.xml b/jdepend/project.xml
index 64d2f4b4..2ca4c2b3 100644
--- a/jdepend/project.xml
+++ b/jdepend/project.xml
@@ -55,8 +55,8 @@
     <developer>
       <name>Emmanuel Venisse</name>
       <id>evenisse</id>
-      <email>evenisse@ifrance.com</email>
-      <organization>Fi System</organization>
+      <email>emmanuel@venisse.net</email>
+      <organization/>
       <roles>
         <role>Java Developer</role>
       </roles>
diff --git a/jnlp/project.xml b/jnlp/project.xml
index 36502338..9ffb91f3 100644
--- a/jnlp/project.xml
+++ b/jnlp/project.xml
@@ -17,8 +17,8 @@
     <developer>
       <name>Emmanuel Venisse</name>
       <id>evenisse</id>
-      <email>evenisse@ifrance.com</email>
-      <organization>Fi System</organization>
+      <email>emmanuel@venisse.net</email>
+      <organization/>
       <roles>
         <role>Java Developer</role>
       </roles>
diff --git a/junit-report/project.xml b/junit-report/project.xml
index 05750e21..bee67df4 100644
--- a/junit-report/project.xml
+++ b/junit-report/project.xml
@@ -34,8 +34,8 @@
     <developer>
       <name>Emmanuel Venisse</name>
       <id>evenisse</id>
-      <email>evenisse@ifrance.com</email>
-      <organization>Fi System</organization>
+      <email>emmanuel@venisse.net</email>
+      <organization/>
       <roles>
         <role>Java Developer</role>
       </roles>
diff --git a/jxr/project.xml b/jxr/project.xml
index 47ffbd2e..ad76a51f 100644
--- a/jxr/project.xml
+++ b/jxr/project.xml
@@ -18,8 +18,8 @@
     <developer>
       <name>Emmanuel Venisse</name>
       <id>evenisse</id>
-      <email>evenisse@ifrance.com</email>
-      <organization>Fi System</organization>
+      <email>emmanuel@venisse.net</email>
+      <organization/>
       <roles>
         <role>Java Developer</role>
       </roles>
diff --git a/license/project.xml b/license/project.xml
index 5820c51f..dc462c1e 100644
--- a/license/project.xml
+++ b/license/project.xml
@@ -27,8 +27,8 @@
     <developer>
       <name>Emmanuel Venisse</name>
       <id>evenisse</id>
-      <email>evenisse@ifrance.com</email>
-      <organization>Fi System</organization>
+      <email>emmanuel@venisse.net</email>
+      <organization/>
       <roles>
         <role>Java Developer</role>
       </roles>
diff --git a/statcvs/project.xml b/statcvs/project.xml
index 6102ae87..3807644a 100644
--- a/statcvs/project.xml
+++ b/statcvs/project.xml
@@ -42,8 +42,8 @@
     <developer>
       <name>Emmanuel Venisse</name>
       <id>evenisse</id>
-      <email>evenisse@ifrance.com</email>
-      <organization>Fi System</organization>
+      <email>emmanuel@venisse.net</email>
+      <organization/>
       <roles>
         <role>Java Developer</role>
       </roles>
diff --git a/tasklist/project.xml b/tasklist/project.xml
index 3fb6fa3a..f3aa4b10 100644
--- a/tasklist/project.xml
+++ b/tasklist/project.xml
@@ -55,8 +55,8 @@
     <developer>
       <name>Emmanuel Venisse</name>
       <id>evenisse</id>
-      <email>evenisse@ifrance.com</email>
-      <organization>Fi System</organization>
+      <email>emmanuel@venisse.net</email>
+      <organization/>
       <roles>
         <role>Java Developer</role>
       </roles>