diff --git a/CREDITS b/CREDITS
index 660d5e67af7d..0dabce0f03f0 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3666,6 +3666,10 @@ S: 149 Union St.
 S: Kingston, Ontario
 S: Canada K7L 2P4
 
+N: Pravin B Shelar
+E: pshelar@ovn.org
+D: Open vSwitch maintenance and contributions
+
 N: John Shifflett
 E: john@geolog.com
 E: jshiffle@netcom.com
diff --git a/MAINTAINERS b/MAINTAINERS
index e0045ac4327b..ff882416c445 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -18097,7 +18097,9 @@ F:	drivers/irqchip/irq-ompic.c
 F:	drivers/irqchip/irq-or1k-*
 
 OPENVSWITCH
-M:	Pravin B Shelar <pshelar@ovn.org>
+M:	Aaron Conole <aconole@redhat.com>
+M:	Eelco Chaudron <echaudro@redhat.com>
+M:	Ilya Maximets <i.maximets@ovn.org>
 L:	netdev@vger.kernel.org
 L:	dev@openvswitch.org
 S:	Maintained