diff --git a/AUTHORS.md b/AUTHORS.md
index 55d2f29..4b7ca13 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -1,36 +1,30 @@
-Mini-NDN Authors
-================
+# Mini-NDN Authors
 
-Mini-NDN is an open source project that includes contributions from the following individuals.
+The following lists maintainers, primary developers, and all much-appreciated contributors to Mini-NDN in alphabetic order.
+The specific contributions of individual authors can be obtained from the git history of the [official Mini-NDN repository](https://github.com/named-data/mini-ndn).
+If you would like to become a contributor to the official repository, please follow the recommendations in https://github.com/named-data/.github/blob/master/CONTRIBUTING.md.
 
-## Mini-NDN contributors and affiliations:
+* Alexander Afanasyev <https://users.cs.fiu.edu/~afanasyev>
+* Muktadir R. Chowdhury <https://github.com/alvyC>
+* Damian Coomes <https://github.com/dmcoomes>
+* ***(Maintainer)*** Saurab Dulal <https://dulalsaurab.github.io>
+* ***(Former Maintainer)*** Ashlesh Gawande <https://www.linkedin.com/in/agawande>
+* Nicholas Gordon <https://github.com/gorgonical>
+* ***(Maintainer)*** Alexander Lane <https://github.com/zephyrmoth>
+* Vince Lehman <http://vslehman.com>
+* Philipp Moll <https://github.com/phylib>
+* Eric Newberry <https://ericnewberry.com>
+* Junxiao Shi <https://cs.arizona.edu/~shijunxiao>
+* Jeff Thompson <https://remap.ucla.edu/jeff-thompson>
+* Yucheng Zhang <https://peterskycloud.wixsite.com/yzportfolio>
 
-* The University of Memphis
+## Technical Advisors
 
-    * Alexander Lane       <awlane@memphis.edu>
-    * Ashlesh Gawande      <https://www.linkedin.com/in/agawande>
-    * Vince Lehman         <http://vslehman.com>
-    * Yucheng Zhang        <yzhang@memphis.edu>
-    * Muktadir R Chowdhury <mrchwdhr@memphis.edu>
-    * Nicholas Gordon      <nmgordon@memphis.edu>
-    * Lan Wang             <http://www.cs.memphis.edu/~lanwang/>
-    * Damian Coomes        <dmcoomes@memphis.edu>
-    * Saurab Dulal         <sdulal@memphis.edu>
+* Lan Wang <http://www.cs.memphis.edu/~lanwang>
+* Beichuan Zhang <http://cs.arizona.edu/~bzhang>
 
-* The University of Arizona
+## The Mini-CCNx team
 
-    * Junxiao Shi    <https://www.linkedin.com/in/shijunxiao>
-    * Beichuan Zhang <http://www.cs.arizona.edu/~bzhang/>
-
-* University of California, Los Angeles
-
-    * Alexander Afanasyev <http://lasr.cs.ucla.edu/afanasyev/index.html>
-    * Jeff Thompson       <jefft0@remap.ucla.edu>
-
-## The Mini-CCNx team:
-
-* University of Campinas
-
-    * Caio de Moraes Elias
-    * Carlos Cabral
-    * Christian Esteve Rothenberg
+* Carlos Cabral <https://github.com/carlosmscabral>
+* Caio de Moraes Elias <https://github.com/ocaio>
+* Christian Esteve Rothenberg <http://www.dca.fee.unicamp.br/~chesteve>