diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 00000000..9bcc1efe
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1 @@
+* @src-d/language-analysis
diff --git a/MAINTAINERS b/MAINTAINERS
index 26868902..01f2fc59 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1 +1,3 @@
 Alexander Bezzubov <alex@sourced.tech> (@bzz)
+Michael Fromberger <michael@sourced.tech> (@creachadair)
+Kuba Podgórski <kuba@sourced.tech> (@kuba--)