2 files changed, 12 insertions, 13 deletions

diff --git a/CREDITS b/CREDITS
index 6bd8ab86b5bd..e3e7271ace0c 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2286,14 +2286,14 @@ S: D-90453 Nuernberg
 S: Germany
 
 N: Arnaldo Carvalho de Melo
-E: acme@mandriva.com
 E: acme@ghostprotocols.net
+E: arnaldo.melo@gmail.com
+E: acme@redhat.com
 W: http://oops.ghostprotocols.net:81/blog/
 P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD  841A B6AB 4681 9224 DF01
 D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks
-S: Mandriva
-S: R. Tocantins, 89 - Cristo Rei
-S: 80050-430 - Curitiba - Paraná
+S: R. Brasílio Itiberê, 4270/1010 - Água Verde
+S: 80240-060 - Curitiba - Paraná
 S: Brazil
 
 N: Karsten Merker
diff --git a/MAINTAINERS b/MAINTAINERS
index 277877a34ef6..ab258c7f46ac 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -384,7 +384,7 @@ S:	Supported
 
 APPLETALK NETWORK LAYER
 P:      Arnaldo Carvalho de Melo
-M:      acme@conectiva.com.br
+M:      acme@ghostprotocols.net
 S:      Maintained
 
 ARC FRAMEBUFFER DRIVER
@@ -1034,9 +1034,8 @@ S:	Maintained
 
 CYCLADES 2X SYNC CARD DRIVER
 P:      Arnaldo Carvalho de Melo
-M:      acme@conectiva.com.br
-W:      http://advogato.org/person/acme
-L:      cycsyn-devel@bazar.conectiva.com.br
+M:      acme@ghostprotocols.net
+W:      http://oops.ghostprotocols.net:81/blog
 S:      Maintained
 
 CYCLADES ASYNC MUX DRIVER
@@ -1077,7 +1076,7 @@ S:	Maintained
 
 DCCP PROTOCOL
 P:      Arnaldo Carvalho de Melo
-M:      acme@mandriva.com
+M:      acme@ghostprotocols.net
 L:      dccp@vger.kernel.org
 W:      http://linux-net.osdl.org/index.php/DCCP
 S:      Maintained
@@ -1871,7 +1870,7 @@ S:	Supported
 
 IPX NETWORK LAYER
 P:      Arnaldo Carvalho de Melo
-M:      acme@conectiva.com.br
+M:      acme@ghostprotocols.net
 L:      netdev@vger.kernel.org
 S:      Maintained
 
@@ -2108,7 +2107,7 @@ S:	Supported
 
 LLC (802.2)
 P:      Arnaldo Carvalho de Melo
-M:      acme@conectiva.com.br
+M:      acme@ghostprotocols.net
 S:      Maintained
 
 LINUX FOR 64BIT POWERPC
@@ -3766,8 +3765,8 @@ S:	Maintained
 
 WL3501 WIRELESS PCMCIA CARD DRIVER
 P:      Arnaldo Carvalho de Melo
-M:      acme@conectiva.com.br
-W:      http://advogato.org/person/acme
+M:      acme@ghostprotocols.net
+W:      http://oops.ghostprotocols.net:81/blog
 S:      Maintained
 
 X.25 NETWORK LAYER