diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000..5a31c9d3
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+.   @kdheepak @RedEtherbloom
\ No newline at end of file
diff --git a/Cargo.toml b/Cargo.toml
index f257a996..aa68cdfd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,7 @@ description = "A Taskwarrior Terminal User Interface"
 repository = "https://github.com/kdheepak/taskwarrior-tui/"
 homepage = "https://kdheepak.com/taskwarrior-tui"
 readme = "README.md"
-authors = ["Dheepak Krishnamurthy <me@kdheepak.com>"]
+authors = ["Dheepak Krishnamurthy <me@kdheepak.com>", "Etherbloom <etherbloom@mailbox.org>"]
 edition = "2018"
 keywords = ["taskwarrior", "tui"]
 categories = ["command-line-utilities"]