diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
new file mode 100644
index 0000000..e251b41
--- /dev/null
+++ b/CONTRIBUTORS.rst
@@ -0,0 +1,53 @@
+============
+Contributors
+============
+
+This file contains a list of every person who has contributed code to
+Overviewer. It was created from the git commit log, and should include
+everyone, but we may have missed a few.
+
+Not currently included (but hopefully soon) are countless testers and bug
+reporters that helped fixed the many bugs that have popped up in the course of
+development.
+
+---------------
+Original Author
+---------------
+
+ * Andrew Brown <brownan@gmail.com>
+
+-------------------------
+Long-term Contributions
+-------------------------
+
+These contributors have made many changes, over a fairly long time span, or
+for many different parts of the code.
+
+ * Alejandro Aguilera <fenixin@lavabit.com>
+ * Andrew Chin <achin@eminence32.net>
+ * Aaron Griffith <aargri@gmail.com>
+ * Alex Headley <aheadley@waysaboutstuff.com>
+ * Alex Jurkiewicz <alex@bluebottle.net.au>
+ * Xon <Xon@localhost>
+
+------------------------
+Short-term Contributions
+------------------------
+
+These contributors have made specific changes for a particular bug fix or
+feature.
+
+ * arrai <array.of.intellect@gmail.com>
+ * Kyle Brantley <kyle@averageurl.com>
+ * cbarber <CraigBarber@taryx.com>
+ * Alex Cline <cline@vivisimo.com>
+ * Stephen Fluin <stephen@mistuph.com>
+ * Benjamin Herr <ben@0x539.de>
+ * Ryan Hitchman <hitchmanr@gmail.com>
+ * Jenny <jennytoo@gmail.com>
+ * Michael Jensen <emjay1988@gmail.com>
+ * Ryan McCue <ryanmccue@cubegames.net>
+ * Morlok8k <otis.spankmeyer@gmail.com>
+ * Gregory Short <gshort2@gmail.com>
+ * Sam Steele <sam@sigbox.c99.org>
+ * timwolla <timwolla@mail.develfusion.com>
diff --git a/README.rst b/README.rst
index 616e8d2..1d0e9ab 100644
--- a/README.rst
+++ b/README.rst
@@ -1,7 +1,7 @@
 ====================
 Minecraft Overviewer
 ====================
-By Andrew Brown and contributors
+By Andrew Brown and contributors (see CONTRIBUTORS.rst).
 
 http://github.com/brownan/Minecraft-Overviewer