diff --git a/[refs] b/[refs]
index cc7468c65a38..0ce7a7203b0f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c98d29ae4d8cb0e2ce78b82b2c1957bcfd7dbd3
+refs/heads/master: 6a5315b0e7fbc028f6e6443cf7fb67b5881e7fa3
diff --git a/trunk/CREDITS b/trunk/CREDITS
index af70678a0afd..c6d69bf10e15 100644
--- a/trunk/CREDITS
+++ b/trunk/CREDITS
@@ -2007,13 +2007,14 @@ S: University of Stuttgart, Germany and
 S: Ecole Nationale Superieure des Telecommunications, Paris
 
 N: Jamie Lokier
-E: jamie@imbolc.ucc.ie
+E: jamie@shareable.org
+W: http://www.shareable.org/
 D: Reboot-through-BIOS for broken 486 motherboards
-D: Some parport fixes
-S: 11 Goodson Walk
-S: Marston
+D: Parport fixes, futex improvements
+D: First instruction of x86 sysenter path :)
+S: 51 Sunningwell Road
 S: Oxford
-S: OX3 0HX
+S: OX1 4SZ
 S: United Kingdom
 
 N: Mark Lord