diff --git a/MAINTAINERS.md b/MAINTAINERS.md
new file mode 100644
index 00000000..c6a533ea
--- /dev/null
+++ b/MAINTAINERS.md
@@ -0,0 +1,18 @@
+Maintainers
+===========
+
+**Active Maintainers**
+
+| Name                  | GitHub                                  | Chat           | Email                              |
+|-----------------------|-----------------------------------------|----------------|------------------------------------|
+| Artem Barger          | [c0rwin][c0rwin]                        | c0rwin         | <artem@bargr.net>                  |
+| Fedor Partanskiy      | [pfi79][pfi79]                          | pfi79          | <fredprtnsk@gmail.com>             |
+| Yacov Manevich        | [yacovm][yacovm]                        | yacovm         | <yacov.manevich@gmail.com>         |
+| Hagar Meir            | [HagarMeir][HagarMeir]                  | HagarMeir      | <hagar.meir@ibm.com>   |
+| Yoav Tock             | [tock-ibm][tock-ibm]                    | tock-ibm       | <tock@il.ibm.com>                  |
+
+[tock-ibm]: https://github.com/tock-ibm
+[HagarMeir]: https://github.com/HagarMeir
+[c0rwin]: https://github.com/c0rwin
+[yacovm]: https://github.com/yacovm
+[pfi79]: https://github.com/pfi79
\ No newline at end of file
diff --git a/README.md b/README.md
index 5157198f..547bc222 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ The source code files are made available under the Apache License, Version 2.0 (
 
 ## Contact
 
-* Yacov Manevich - [yacovm@il.ibm.com](mailto:yacovm@il.ibm.com)
+* Yacov Manevich - [yacov.manevich@gmail.com](mailto:yacov.manevich@gmail.com)
 * Hagar Meir - [hagar.meir@ibm.com](mailto:hagar.meir@ibm.com)
-* Artem Barger - [bartem@il.ibm.com](mailto:bartem@il.ibm.com)
+* Artem Barger - [artem@bargr.net](mailto:artem@bargr.net)
 * Yoav Tock - [tock@il.ibm.com](mailto:tock@il.ibm.com)