diff --git a/MAINTAINERS.md b/MAINTAINERS.md
new file mode 100644
index 00000000..39533605
--- /dev/null
+++ b/MAINTAINERS.md
@@ -0,0 +1,7 @@
+The primary maintainers of this project are:
+
+| Maintainer       | GitHub ID                                             | Affiliation |
+| ---------------- | ----------------------------------------------------- | ----------- |
+| Jim Garlick      | [garlick](https://github.com/garlick)                 | LLNL        |
+| Mark Grondona    | [grondo](https://github.com/grondo)                   | LLNL        |
+| Al Chu           | [chu11](https://github.com/chu11)                     | LLNL        |
diff --git a/Makefile.am b/Makefile.am
index 98f7a5a2..e5e8297e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,8 @@ SUBDIRS = \
 	t
 
 EXTRA_DIST = \
-	NEWS.md
+	NEWS.md \
+	MAINTAINERS.md
 
 export DEB_BUILD_OPTIONS ?= nocheck terse
 deb: debian scripts/debbuild.sh
diff --git a/src/cmd/diodcli.c b/src/cmd/diodcli.c
index ab16eb65..fa67ec77 100644
--- a/src/cmd/diodcli.c
+++ b/src/cmd/diodcli.c
@@ -75,6 +75,7 @@ static char *prog;
 /* Try to Twalk an open fid.
  * This mimics what the linux kernel v9fs client does when
  * we ls -l a mounted directory.
+ * See also: chaos/diod#47
  */
 int cmd_open_walk (Npcfid *root, int argc, char **argv)
 {
@@ -106,6 +107,7 @@ int cmd_open_walk (Npcfid *root, int argc, char **argv)
 }
 
 /* Tread should work on opened fids even if the file has been removed
+ * See also: chaos/diod#47
  */
 int cmd_open_remove_read (Npcfid *root, int argc, char **argv)
 {
@@ -142,6 +144,7 @@ int cmd_open_remove_read (Npcfid *root, int argc, char **argv)
 }
 
 /* Tgetattr should work on opened fids even if the file has been removed
+ * See also: chaos/diod#19
  */
 int cmd_open_remove_getattr (Npcfid *root, int argc, char **argv)
 {
@@ -182,6 +185,7 @@ int cmd_open_remove_getattr (Npcfid *root, int argc, char **argv)
 }
 
 /* Tsetattr should work on opened fids even if the file has been removed
+ * See also: chaos/diod#47
  */
 int cmd_open_remove_setattr (Npcfid *root, int argc, char **argv)
 {
@@ -246,6 +250,7 @@ int create_file (Npcfid *root, char *name, u32 mode, char *content, size_t len)
 
 /* Tsetattr on a fid opened from path should not affect path when path
  * is no longer the same file
+ * See also: chaos/diod#47
  */
 int cmd_open_remove_create_setattr (Npcfid *root, int argc, char **argv)
 {