diff --git a/[refs] b/[refs]
index b01206082393..ee9980fe50b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fddcdb70fd9e8fd52d42ed52a572fecb8eb7cde
+refs/heads/master: 8f8f013478133eb98e35e1d669c98c5e39d769c7
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 9d1601ec1311..18c3f0c41c95 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -3287,11 +3287,11 @@ F:	include/linux/ivtv*
 
 JFS FILESYSTEM
 P:	Dave Kleikamp
-M:	shaggy@austin.ibm.com
+M:	shaggy@linux.vnet.ibm.com
 L:	jfs-discussion@lists.sourceforge.net
 W:	http://jfs.sourceforge.net/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git
-S:	Supported
+S:	Maintained
 F:	Documentation/filesystems/jfs.txt
 F:	fs/jfs/