diff --git a/MAINTAINERS b/MAINTAINERS
index 2d8517b182..1c595f40e6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -78,7 +78,6 @@ Maintainers List (try to look for most precise areas first)
 ACPI & POWER MANAGEMENT
 M:	Winston Wang <winston.l.wang@intel.com>
 M:	Gang Wei <gang.wei@intel.com>
-M:	Mark Langsdorf <mark.langsdorf@amd.com>
 M:	Jan Beulich <jbeulich@suse.com>
 S:	Supported
 F:	xen/arch/x86/acpi/
@@ -86,13 +85,15 @@ F:	xen/drivers/acpi/
 F:	xen/drivers/cpufreq/
 
 AMD IOMMU
-M:	Wei Wang <wei.wang2@amd.com>
-S:	Supported
+M:	Wei Wang <weiwang.dd@gmail.com>
+M:	Wei Huang <wei.huang2@amd.com>
+S:	Maintained
 F:	xen/drivers/passthrough/amd/
 
 AMD SVM
-M:	Andre Przywara <andre.przywara@amd.com>
-M:	Christoph Egger <christoph.egger@amd.com>
+M:	Andre Przywara <osp@andrep.de>
+M:	Christoph Egger <Christoph_Egger@gmx.de>
+M:	Boris Ostrovsky <boris.ostrovsky@amd.com>
 M:	Wei Huang <wei.huang2@amd.com>
 S:	Supported
 F:	xen/arch/x86/hvm/svm/
@@ -170,7 +171,7 @@ S:	Supported
 T:	hg http://xenbits.xen.org/XCP/linux-2.6.*.pq.hg
 
 MACHINE CHECK (MCA) & RAS
-M:	Christoph Egger <christoph.egger@amd.com>
+M:	Christoph Egger <Christoph_Egger@gmx.de>
 M:	Yunhong Jiang <yunhong.jiang@intel.com>
 S:	Supported
 F:	xen/arch/x86/cpu/mcheck/