diff --git a/conf/type/__cdistmarker/man.text b/conf/type/__cdistmarker/man.text
index 360598d8..1e9079f5 100644
--- a/conf/type/__cdistmarker/man.text
+++ b/conf/type/__cdistmarker/man.text
@@ -1,6 +1,6 @@
 cdist-type__cdistmarker(7)
 ==========================
-Daniel Maher <phrawzty+cdist at gmail.com>
+Daniel Maher <phrawzty cdist at gmail.com>
 
 
 NAME
diff --git a/conf/type/__ssh_authorized_key/man.text b/conf/type/__ssh_authorized_key/man.text
index af0c2017..b372b354 100644
--- a/conf/type/__ssh_authorized_key/man.text
+++ b/conf/type/__ssh_authorized_key/man.text
@@ -1,6 +1,6 @@
 cdist-type__ssh_authorized_key(7)
 =================================
-Aurélien Bondis - aurelien.bondis AT gmail DOT com
+Aurélien Bondis <aurelien.bondis--@--gmail-DOT-com>
 
 
 NAME
diff --git a/conf/type/__timezone/man.text b/conf/type/__timezone/man.text
index 89136855..6f0c5101 100644
--- a/conf/type/__timezone/man.text
+++ b/conf/type/__timezone/man.text
@@ -1,6 +1,6 @@
 cdist-type__timezone(7)
 =======================
-Ramon Salvadó - rsalvado at gnuine dot com
+Ramon Salvadó <rsalvado--@--gnuine--dot--com>
 
 
 NAME