diff --git a/README.md b/README.md
index df5c32ca88964c920c3b692ba38cc1c7446ecf08..673ce4cb5a7f25c963de1a0cd626c125255ce88d 100644
--- a/README.md
+++ b/README.md
@@ -65,7 +65,7 @@ keep the peers associated with any user under 5.
 
 ## Contact 
 
-You can contact us directly at fod{at}geant[dot]org
+You can contact us directly at fod{at}lists[dot]geant(.)org
 
 ## Copyright and license
 
diff --git a/doc/index.md b/doc/index.md
index 2e483bb16f3bdb4350f20f8514abc028e5442676..9e4e4c0934288f0d73ab0a8e8716560981c8b754 100644
--- a/doc/index.md
+++ b/doc/index.md
@@ -53,7 +53,7 @@ case the flowspec capable device is an EX4200.
 You can find more about FoD or raise your issues at [Github FoD
 repository].
 
-You can contact us directly at fod{at}geant[dot]org
+You can contact us directly at fod{at}lists[dot]geant(.)org
 
 # GRNET Contact