diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..36fb78bf
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+Tim Moore <mtimc@umich.edu> Tim Moore <tcmoore3@gmail.com>
+Tommy Waltmann <tomwalt@umich.edu> Tommy Waltmann <53307607+tommy-waltmann@users.noreply.github.com>
+Tommy Waltmann <tomwalt@umich.edu> tommy-waltmann <53307607+tommy-waltmann@users.noreply.github.com>
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2af1642e..30a0bdfe 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,7 +6,7 @@ the project.
 
 ## Base your work off the correct branch
 
-All new work should be based on `main`.
+All new work should be based on `trunk`.
 
 ## Propose a minimal set of related changes
 
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
new file mode 100644
index 00000000..0500dcaf
--- /dev/null
+++ b/CONTRIBUTORS.md
@@ -0,0 +1,8 @@
+# Contributors
+
+The following people have contributed to hoomd-validation:
+
+* Joshua A. Anderson, University of Michigan
+* Tommy Waltmann, University of Michigan
+* Tim Moore, University of Michigan
+* Brandon Butler, University of Michigan