diff --git a/openstack-config/havana-all b/openstack-config/havana-all
index 24a3897..eeebd48 100644
--- a/openstack-config/havana-all
+++ b/openstack-config/havana-all
@@ -1,4 +1,11 @@
-# project revisions
+# havana-all includes all of the sub-projects defined in havana-*
+# it can be regenerated by doing, e.g.:
+# cat havana-integrated havana-library havana-docs havana-gating \
+#    havana-incubated havana-bucket havana-infra havana-unofficial > havana-all
+#
+
+# OpenStack integrated projects
+# as defined at https://wiki.openstack.org/wiki/Projects
 nova 2013.1..HEAD
 swift 1.8.0..HEAD
 glance 2013.1..HEAD
@@ -8,17 +15,121 @@ quantum 2013.1..HEAD
 cinder 2013.1..HEAD
 ceilometer 2013.1..HEAD
 heat 2013.1..HEAD
-# client libraries
-python-novaclient 2.13.0..HEAD
-python-swiftclient 1.3.0..HEAD
-python-glanceclient 0.9.0..HEAD
-python-keystoneclient 0.2.3..HEAD
-python-quantumclient 2.2.1..HEAD
-python-cinderclient 1.0.3..HEAD
-python-ceilometerclient 1.0.0..HEAD
-python-heatclient 0.2.2..HEAD
-# other important repositories
-oslo-incubator 2013.1..HEAD
-devstack 4b1dbb5d..HEAD
-tempest a6b85b82..HEAD
-openstack-manuals d7d27db6..HEAD
+# OpenStack library projects
+# as described at https://wiki.openstack.org/wiki/Projects
+# note: oslo.config has tags, but they don't appear to be current with grizzly release
+oslo.config fc8ca59..
+oslo-incubator 2013.1
+python-novaclient 2.13.0..
+python-swiftclient 1.3.0..
+python-glanceclient 0.9.0..
+python-keystoneclient 0.2.3..
+python-quantumclient 2.2.1..
+python-cinderclient 1.0.3..
+python-ceilometerclient 1.0.0..
+python-heatclient 0.2.2..
+# OpenStack documentation projects
+# as described at https://wiki.openstack.org/wiki/Projects
+compute-api 2013.1..
+identity-api 2013.1..
+image-api 2013.1..
+netconn-api 2013.1..
+object-api 2013.1..
+volume-api 2013.1..
+openstack-manuals 2013.1.rc2..
+api-site 2013.1..
+# openstack gating projects
+# As described at https://wiki.openstack.org/wiki/Projects
+# note: devstack, tempest, and requirements don't have tag 2013.1,
+# so we'll use the commit closest to the 2013-04-04 grizzly release
+devstack 896eb66..
+tempest 017e95c..
+requirements aea036d..
+# note: need to update openstack-nose once a commit happens in havana
+openstack-nose a103741..
+# OpenStack incubated projects
+# as described at https://wiki.openstack.org/wiki/Projects
+# Note:  trove and ironic do not have tags such as 2013.1, so use
+# the commit whose date most closely aligns with the official grizzly
+# release on 2013-04-04
+trove b15d347..
+trove-integration bac5b1b..
+python-trove-client 6222dea..
+ironic 8e05dbf..
+# note: python-ironicclient is currently just a stub, but putting here 
+# for future reference
+python-ironicclient
+# openstack bucket projects
+# these are projects that are developed within the openstack atmosphere
+# (i.e. they are not "unofficial" per se), but are not explicitly 
+# listed at https://wiki.openstack.org/wiki/Projects.  Since I'm not
+# sure where they should go, but I want to be able to measure them,
+# I'm putting them into a 'havana-bucket' list
+grenade d4f97a5..
+pbr 0.5.8..
+hacking 46e0d50..
+heat-templates d94bf0c..
+heat-cfntools e0f2666..
+# OpenStack infrastructure projects
+# as described at https://wiki.openstack.org/wiki/Projects
+config e8862b1..
+gear 6044080..
+jeepyb 18e8256..
+zuul 8259510..
+gearman-plugin c4e660f..
+devstack-gate fae4700..
+jenkins-job-builder 96a72de..
+gitdm 8f01611..
+git-review 1.21..
+gerrit 19507d3..
+gerritlib 81a0066..
+# note: need to update gerritbot once a commit happens in havana
+gerritbot 6563e96..
+reviewday c3044dd..
+askbot-theme d1cfa0b..
+releasestatus 94b0b30..
+# note: need to update zmq-event-publisher once a commit happens in havana
+zmq-event-publisher 135d273..
+# note: need to update statusbot once a commit happens in havana
+statusbot 336c7d9..
+# note: need to update puppet-dashboard once a commit happens in havana
+puppet-dashboard 7c8a306..
+# note: need to update puppet-apparmor once a commit happens in havana
+puppet-apparmor 6c51fe5..
+# note: need to update puppet-vcsrepo once a commit happens in havana
+puppet-vcsrepo 4c3e9b2..
+# note: need to update meetbot once a commit happens in havana
+meetbot bf953cc..
+# note: need to update lodgeit once a commit happens in havana
+lodgeit dfd551f..
+# note: need to update nose-html-output once a commit happens in havana
+nose-html-output 714b4242..
+# Unofficial OpenStack Projects
+# as described at https://wiki.openstack.org/wiki/Projects
+#
+# Related - unofficial projects with no rights to use OpenStack brand and 
+# assets or project resources 
+# 
+# Related projects are made up of projects that have chosen to associate 
+# themselves with OpenStack. These projects are not officially tied to 
+# OpenStack or any OpenStack processes or resources, but may make use of 
+# OpenStack or add functionality on top of OpenStack projects. The "related 
+# project" designation is meant to provide an aggregation method for the 
+# community to expose useful projects and products in the OpenStack 
+# ecosystem that are not directly part of the core or incubated projects. 
+#
+#tripleo - not sure what project(s) this includes
+designate 8a3d9fc..
+marconi 1a15292..
+python-marconiclient e414f78..
+savanna 8fdeefd..
+savanna-dashboard 06bce5a..
+murano-docs 9bc82af..
+murano-api 9bc82af..
+murano-conductor 9bc82af..
+murano-dashboard 9bc82af..
+murano-agent 9bc82af..
+murano-deployment 9bc82af..
+murano-tests 9bc82af..
+python-muranoclient 9bc82af..
+#convection - not sure what project(s) this encompasses
diff --git a/openstack-config/havana-bucket b/openstack-config/havana-bucket
new file mode 100644
index 0000000..2e0d7bc
--- /dev/null
+++ b/openstack-config/havana-bucket
@@ -0,0 +1,11 @@
+# openstack bucket projects
+# these are projects that are developed within the openstack atmosphere
+# (i.e. they are not "unofficial" per se), but are not explicitly 
+# listed at https://wiki.openstack.org/wiki/Projects.  Since I'm not
+# sure where they should go, but I want to be able to measure them,
+# I'm putting them into a 'havana-bucket' list
+grenade d4f97a5..
+pbr 0.5.8..
+hacking 46e0d50..
+heat-templates d94bf0c..
+heat-cfntools e0f2666..
diff --git a/openstack-config/havana-docs b/openstack-config/havana-docs
new file mode 100644
index 0000000..c2cdea9
--- /dev/null
+++ b/openstack-config/havana-docs
@@ -0,0 +1,10 @@
+# OpenStack documentation projects
+# as described at https://wiki.openstack.org/wiki/Projects
+compute-api 2013.1..
+identity-api 2013.1..
+image-api 2013.1..
+netconn-api 2013.1..
+object-api 2013.1..
+volume-api 2013.1..
+openstack-manuals 2013.1.rc2..
+api-site 2013.1..
diff --git a/openstack-config/havana-gating b/openstack-config/havana-gating
new file mode 100644
index 0000000..fb80168
--- /dev/null
+++ b/openstack-config/havana-gating
@@ -0,0 +1,9 @@
+# openstack gating projects
+# As described at https://wiki.openstack.org/wiki/Projects
+# note: devstack, tempest, and requirements don't have tag 2013.1,
+# so we'll use the commit closest to the 2013-04-04 grizzly release
+devstack 896eb66..
+tempest 017e95c..
+requirements aea036d..
+# note: need to update openstack-nose once a commit happens in havana
+openstack-nose a103741..
diff --git a/openstack-config/havana-incubated b/openstack-config/havana-incubated
new file mode 100644
index 0000000..cb3008c
--- /dev/null
+++ b/openstack-config/havana-incubated
@@ -0,0 +1,12 @@
+# OpenStack incubated projects
+# as described at https://wiki.openstack.org/wiki/Projects
+# Note:  trove and ironic do not have tags such as 2013.1, so use
+# the commit whose date most closely aligns with the official grizzly
+# release on 2013-04-04
+trove b15d347..
+trove-integration bac5b1b..
+python-trove-client 6222dea..
+ironic 8e05dbf..
+# note: python-ironicclient is currently just a stub, but putting here 
+# for future reference
+python-ironicclient
diff --git a/openstack-config/havana-infra b/openstack-config/havana-infra
new file mode 100644
index 0000000..51ba02f
--- /dev/null
+++ b/openstack-config/havana-infra
@@ -0,0 +1,34 @@
+# OpenStack infrastructure projects
+# as described at https://wiki.openstack.org/wiki/Projects
+config e8862b1..
+gear 6044080..
+jeepyb 18e8256..
+zuul 8259510..
+gearman-plugin c4e660f..
+devstack-gate fae4700..
+jenkins-job-builder 96a72de..
+gitdm 8f01611..
+git-review 1.21..
+gerrit 19507d3..
+gerritlib 81a0066..
+# note: need to update gerritbot once a commit happens in havana
+gerritbot 6563e96..
+reviewday c3044dd..
+askbot-theme d1cfa0b..
+releasestatus 94b0b30..
+# note: need to update zmq-event-publisher once a commit happens in havana
+zmq-event-publisher 135d273..
+# note: need to update statusbot once a commit happens in havana
+statusbot 336c7d9..
+# note: need to update puppet-dashboard once a commit happens in havana
+puppet-dashboard 7c8a306..
+# note: need to update puppet-apparmor once a commit happens in havana
+puppet-apparmor 6c51fe5..
+# note: need to update puppet-vcsrepo once a commit happens in havana
+puppet-vcsrepo 4c3e9b2..
+# note: need to update meetbot once a commit happens in havana
+meetbot bf953cc..
+# note: need to update lodgeit once a commit happens in havana
+lodgeit dfd551f..
+# note: need to update nose-html-output once a commit happens in havana
+nose-html-output 714b4242..
diff --git a/openstack-config/havana-integrated b/openstack-config/havana-integrated
new file mode 100644
index 0000000..85bc149
--- /dev/null
+++ b/openstack-config/havana-integrated
@@ -0,0 +1,11 @@
+# OpenStack integrated projects
+# as defined at https://wiki.openstack.org/wiki/Projects
+nova 2013.1..HEAD
+swift 1.8.0..HEAD
+glance 2013.1..HEAD
+keystone 2013.1..HEAD
+horizon 2013.1..HEAD
+quantum 2013.1..HEAD
+cinder 2013.1..HEAD
+ceilometer 2013.1..HEAD
+heat 2013.1..HEAD
diff --git a/openstack-config/havana-library b/openstack-config/havana-library
new file mode 100644
index 0000000..e5b68a0
--- /dev/null
+++ b/openstack-config/havana-library
@@ -0,0 +1,13 @@
+# OpenStack library projects
+# as described at https://wiki.openstack.org/wiki/Projects
+# note: oslo.config has tags, but they don't appear to be current with grizzly release
+oslo.config fc8ca59..
+oslo-incubator 2013.1
+python-novaclient 2.13.0..
+python-swiftclient 1.3.0..
+python-glanceclient 0.9.0..
+python-keystoneclient 0.2.3..
+python-quantumclient 2.2.1..
+python-cinderclient 1.0.3..
+python-ceilometerclient 1.0.0..
+python-heatclient 0.2.2..
diff --git a/openstack-config/havana-unofficial b/openstack-config/havana-unofficial
new file mode 100644
index 0000000..63b1409
--- /dev/null
+++ b/openstack-config/havana-unofficial
@@ -0,0 +1,29 @@
+# Unofficial OpenStack Projects
+# as described at https://wiki.openstack.org/wiki/Projects
+#
+# Related - unofficial projects with no rights to use OpenStack brand and 
+# assets or project resources 
+# 
+# Related projects are made up of projects that have chosen to associate 
+# themselves with OpenStack. These projects are not officially tied to 
+# OpenStack or any OpenStack processes or resources, but may make use of 
+# OpenStack or add functionality on top of OpenStack projects. The "related 
+# project" designation is meant to provide an aggregation method for the 
+# community to expose useful projects and products in the OpenStack 
+# ecosystem that are not directly part of the core or incubated projects. 
+#
+#tripleo - not sure what project(s) this includes
+designate 8a3d9fc..
+marconi 1a15292..
+python-marconiclient e414f78..
+savanna 8fdeefd..
+savanna-dashboard 06bce5a..
+murano-docs 9bc82af..
+murano-api 9bc82af..
+murano-conductor 9bc82af..
+murano-dashboard 9bc82af..
+murano-agent 9bc82af..
+murano-deployment 9bc82af..
+murano-tests 9bc82af..
+python-muranoclient 9bc82af..
+#convection - not sure what project(s) this encompasses