diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
new file mode 100644
index 00000000..54c8cc8d
--- /dev/null
+++ b/CONTRIBUTORS.rst
@@ -0,0 +1,35 @@
+Contributors to pylxd
+~~~~~~~~~~~~~~~~~~~~~
+
+
+These are the contributors to pylxd according to the Github repository.
+
+ =============== ==================================
+ GH username      Name
+ =============== ==================================
+ rockstar        Paul Hummer
+ zulcss          Chuck Short
+ saviq           Michał Sawicz
+ javacruft       James Page (Canonical)
+ pcdummy         Rene Jochum
+ jpic            ???
+ hsoft           Virgil Dupras
+ mgwilliams      Matthew Williams
+ tych0           Tycho Andersen (Canonical)
+ aarnaud         Anthony Arnaud
+ moreati         Alex Willmer
+ uglide          Igor Malinovskiy
+ Itxaka          ???
+ ivuk            Igor Vuk
+ reversecipher   ???
+ stgraber        Stéphane Graber (Canonical)
+ toshism         Tosh Lyons
+ om26er          Omer Akram
+ sergiusens      Sergio Schvezov
+ datashaman      ???
+ rooty0          ???
+ jimmymccrory    Jimmy McCrory
+ Synforge        Paul Oyston
+ overquota       ???
+ =============== ==================================
+
diff --git a/setup.cfg b/setup.cfg
index 62c72db0..84109c65 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,8 +4,8 @@ summary = python library for lxd
 version = 2.2.4
 description-file =
     README.rst
-author = Paul Hummer
-author-email = paul.hummer@canonical.com
+author = Paul Hummer and others (see CONTRIBUTORS.rst)
+author-email = lxc-devel@lists.linuxcontainers.org
 home-page = http://www.linuxcontainers.org
 classifier =
     Environment :: OpenStack
@@ -19,6 +19,7 @@ classifier =
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.3
     Programming Language :: Python :: 3.4
+    Programming Language :: Python :: 3.5
 
 [files]
 packages =