diff --git a/README.rst b/README.rst
index 3515956..5f750dd 100644
--- a/README.rst
+++ b/README.rst
@@ -19,8 +19,10 @@ Generate a Python package project::
 
     cookiecutter https://git.openstack.org/openstack-dev/cookiecutter.git
 
-OpenStack projects require a working git repo for pbr to work, so you need to
-init a repo and commit to it before doing anything else::
+OpenStack projects require a working git repo for pbr to work, on newer
+versions of cookiecutter (>= 0.7.0 released 2013-11-09) this inital commit will
+be done automatically. Otherwise you will need to init a repo and commit to it
+before doing anything else::
 
     cd $repo_name
     git init
diff --git a/hooks/post_gen_project.sh b/hooks/post_gen_project.sh
new file mode 100755
index 0000000..4fe45be
--- /dev/null
+++ b/hooks/post_gen_project.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+
+git init
+git add .
+git commit -a -m "Initial Cookiecutter Commit."