diff --git a/.gitignore b/.gitignore
index 7e715b7b6..5c7c84b0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *.pyc
 *.DS_Store
+AUTHORS
 build/*
 build-stamp
 quantum.egg-info/
diff --git a/MANIFEST.in b/MANIFEST.in
index 771d8ccde..ca45b325d 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
-include README LICENSE TESTING
+include README LICENSE TESTING AUTHORS
 include run_tests.py run_tests.sh
 include .pylintrc
 include openstack-common.conf
diff --git a/setup.py b/setup.py
index d44e791f3..409a33851 100644
--- a/setup.py
+++ b/setup.py
@@ -14,6 +14,7 @@
 
 from setuptools import setup, find_packages
 
+from quantum.openstack.common.setup import generate_authors
 from quantum.openstack.common.setup import parse_requirements
 from quantum.openstack.common.setup import parse_dependency_links
 from quantum.openstack.common.setup import write_requirements
@@ -29,6 +30,7 @@ depend_links = parse_dependency_links()
 write_requirements()
 write_git_changelog()
 write_vcsversion('quantum/vcsversion.py')
+generate_authors()
 
 from quantum import version