diff --git a/cmatrix/Pkgfile b/cmatrix/Pkgfile
index 2466e00d1..f7e7d27ec 100644
--- a/cmatrix/Pkgfile
+++ b/cmatrix/Pkgfile
@@ -1,7 +1,7 @@
 # Description: Show a scrolling 'Matrix' like screen in Linux.
 # URL:         http://www.asty.org/cmatrix/
 # Maintainer:  Thomas Penteker, tek at serverop dot de
-# Packager:    Vincenzo Colosimo <vico@bicisport.de>
+# Packager:    Vincenzo Colosimo vico at bicisport dot de
 #
 # Depends on:   
 
diff --git a/feh/Pkgfile b/feh/Pkgfile
index fac525579..305254a06 100644
--- a/feh/Pkgfile
+++ b/feh/Pkgfile
@@ -1,7 +1,7 @@
 # Description: A fast commandline-driven image viewer for X.
 # URL:         http://www.linuxbrit.co.uk/feh
 # Maintainer:  Thomas Penteker, tek at serverop dot de
-# Packager:    Vincenzo Colosimo <vico@bicisport.de>
+# Packager:    Vincenzo Colosimo vico at bicisport dot de
 #
 # Depends on:  giblib
 
diff --git a/genmenu/Pkgfile b/genmenu/Pkgfile
index 69266911c..b0341525d 100644
--- a/genmenu/Pkgfile
+++ b/genmenu/Pkgfile
@@ -1,7 +1,7 @@
 # Description: Menu generator for Flux/Black/Openbox, WindowMaker and Enlightenment.
 # URL:         http://gtk.no/genmenu
 # Maintainer:  Thomas Penteker, tek at serverop dot de
-# Packager:    Vincenzo Colosimo <vico@bicisport.de>
+# Packager:    Vincenzo Colosimo vico at bicisport dot de
 # Depends on:
 
 name=genmenu
diff --git a/keychain/Pkgfile b/keychain/Pkgfile
index 2ab1ab5ac..78a9a4067 100644
--- a/keychain/Pkgfile
+++ b/keychain/Pkgfile
@@ -1,7 +1,7 @@
 # Description: A front-end to ssh-agent.
 # URL:         http://www.gentoo.org/proj/en/keychain.xml
 # Maintainer:  Thomas Penteker, tek at serverop dot de
-# Packager:    Stoyan Zhekov <zhware@hotpop.com>
+# Packager:    Stoyan Zhekov zhware at hotpop dot com
 # Depends on:
 
 name=keychain
diff --git a/menumaker/Pkgfile b/menumaker/Pkgfile
index d1375f855..3037f1a79 100644
--- a/menumaker/Pkgfile
+++ b/menumaker/Pkgfile
@@ -1,7 +1,7 @@
 # Description: Tool for generate menu for many window manager.
 # URL:         http://menumaker.sourceforge.net/
-# Packager:    Coviello Giuseppe <giuseppecoviello@tin.it>
 # Maintainer:  Thomas Penteker, tek at serverop dot de
+# Packager:    Coviello Giuseppe giuseppecoviello at tin dot it
 # Depends on:  python
 
 name=menumaker
diff --git a/spamassassin/Pkgfile b/spamassassin/Pkgfile
index 640cf14d3..7716d5cb7 100644
--- a/spamassassin/Pkgfile
+++ b/spamassassin/Pkgfile
@@ -1,7 +1,7 @@
 # Description: SpamAssassin(tm) is a mail filter to identify spam.
 # URL:         http://www.spamassassin.org
 # Maintainer:  Thomas Penteker, tek at serverop dot de
-# Packager:    Victor <victord@users.berlios.de>
+# Packager:    Victor victord at users dot berlios dot de
 # Depends on:  p5-digest-sha1, p5-html-parser, p5-net-dns
 
 name=spamassassin