diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000000..15bf27a8c7
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,8 @@
+# Default code owners
+@kentrussell @fxkamd @dayatsin-amd
+
+*.md @ROCm/rocm-documentation @kentrussell @dayatsin-amd
+*.rst @ROCm/rocm-documentation @kentrussell @dayatsin-amd
+
+# Header directory for Doxygen documentation
+inc/* @ROCm/rocm-documentation @kentrussell @fxkamd @dayatsin-amd
diff --git a/.gitignore b/.gitignore
index 1140a6dcaa..6950597ee3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 #
 !.gitignore
 !.mailmap
+.github*
 patches-*
 build/
 outgoing/