diff --git a/.mailmap b/.mailmap
index c7b10caecc4ee24a17f14be238c301391451f0b3..cd1090fd2cc5c8cbc8c03180b7d2bf0bc4904c8c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -71,6 +71,8 @@ James E Wilson <wilson@specifix.com>
 James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
 James Hogan <jhogan@kernel.org> <james@albanarts.com>
 James Ketrenos <jketreno@io.(none)>
+Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
+Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
 Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
 <javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
 Jean Tourrilhes <jt@hpl.hp.com>
diff --git a/MAINTAINERS b/MAINTAINERS
index f1688510178a91f09f3878496023977a4ab08cb8..402f01e69b93bc51005a57113c2ce917f8e3251e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6775,6 +6775,7 @@ F:	drivers/ipack/
 
 INFINIBAND SUBSYSTEM
 M:	Doug Ledford <dledford@redhat.com>
+M:	Jason Gunthorpe <jgg@mellanox.com>
 L:	linux-rdma@vger.kernel.org
 W:	http://www.openfabrics.org/
 Q:	http://patchwork.kernel.org/project/linux-rdma/list/