diff --git a/[refs] b/[refs]
index 42df61ef0633..df223edd9574 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8341de60c76c400eaa453c91810ba6995d2fdb57
+refs/heads/master: cdb0e9a7af3ad34f3f879fda9251039c4cad3403
diff --git a/trunk/CREDITS b/trunk/CREDITS
index 79fd13dbb8e4..10c214dc95e7 100644
--- a/trunk/CREDITS
+++ b/trunk/CREDITS
@@ -2212,13 +2212,13 @@ S: 2300 Copenhagen S
 S: Denmark
 
 N: Claudio S. Matsuoka
-E: claudio@conectiva.com
-E: claudio@helllabs.org
+E: cmatsuoka@gmail.com
+E: claudio@mandriva.com
 W: http://helllabs.org/~claudio
-D: V4L, OV511 driver hacks
+D: V4L, OV511 and HDA-codec hacks
 S: Conectiva S.A.
-S: R. Tocantins 89
-S: 80050-430  Curitiba PR
+S: Souza Naves 1250
+S: 80050-040  Curitiba PR
 S: Brazil
 
 N: Heinz Mauelshagen