diff --git a/gitolite-pystagit/gitolite.rc b/gitolite-pystagit/gitolite.rc
index 16bee4e..a5181d5 100644
--- a/gitolite-pystagit/gitolite.rc
+++ b/gitolite-pystagit/gitolite.rc
@@ -91,7 +91,8 @@
     ],
 
     POST_CREATE => [
-        'build-pystagit-repo'
+        'build-pystagit-repo',
+        'build-pystagit-index'
     ],
 
     # List of commands and features to enable
diff --git a/gitolite-pystagit/local_code/hooks/common/post-receive b/gitolite-pystagit/local_code/hooks/common/post-receive
index 855485e..d0dadc2 100644
--- a/gitolite-pystagit/local_code/hooks/common/post-receive
+++ b/gitolite-pystagit/local_code/hooks/common/post-receive
@@ -3,4 +3,5 @@
 set -e
 
 [ -n "${GL_REPO}" ] && \
-    /usr/local/bin/build-pystagit-repo "${GL_REPO}"
+    /usr/local/bin/build-pystagit-repo "${GL_REPO}" &&
+    /usr/local/bin/build-pystagit-index