diff --git a/AUTHORS.rst b/AUTHORS.rst
new file mode 100644
index 00000000..d797f3da
--- /dev/null
+++ b/AUTHORS.rst
@@ -0,0 +1,14 @@
+#######
+AUTHORS
+#######
+(in chronological order)
+
+- Ralf Schmitt <ralf@systemexit.de>,
+- Kostis Anagnostopoulos <ankostis@gmail.com>
+- run  ``git log --format='%aN' | sort -u`` to see all contributors, or::
+
+      git log --format='%aN <%aE>' |
+        awk '{arr[$0]++} END{for (i in arr){print arr[i], i;}}' |
+        sort -rn | cut -d\  -f2-
+
+  to sort them by the numbers of commits.
\ No newline at end of file
diff --git a/README.rst b/README.rst
index 711281d8..f1ad891b 100644
--- a/README.rst
+++ b/README.rst
@@ -6,13 +6,12 @@ pypiserver - minimal PyPI server for use with pip/easy_install
 |pypi-ver| |travis-status| |dependencies| |downloads-count| |python-ver| \
 |proj-license|
 
-:Authors:   Ralf Schmitt <ralf@systemexit.de>,
-            Kostis Anagnostopoulos <ankostis@gmail.com>
+:Maintainer:Kostis Anagnostopoulos <ankostis@gmail.com>
 :Version:   1.1.8
 :Date:      2015-03-8
 :Source:    https://github.com/pypiserver/pypiserver
-:PyPI repo: https://pypi.python.org/pypi/pypiserver#downloads
-:TravisCI:  https://travis-ci.org/pypiserver/pypiserver
+:PyPI:      https://pypi.python.org/pypi/pypiserver#downloads
+:Travis:    https://travis-ci.org/pypiserver/pypiserver
 :License:   zlib/libpng + MIT
 
 .. contents:: Table of Contents