diff --git a/_includes/header.html b/_includes/header.html
index b9b13aa..259f51d 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -37,7 +37,13 @@
                             title="Features" href="{{ "/features/" | prepend: site.baseurl }}">Features</a></li>
                     <li id="menu-item-17"
                         class="menu-item menu-item-type-post_type menu-item-object-page {% if url == "/community/" %}current-menu-item page_item page-item-12 current_page_item active {% endif %}menu-item-17"><a
-                            title="Community" href="{{ "/community/" | prepend: site.baseurl }}">Community</a></li>
+                            title="Community" href="{{ "/community/" | prepend: site.baseurl }}">Community</a>
+                        <ul role="menu" class=" drop-down">
+                            <li id="menu-item-297"
+                                class="menu-item menu-item-type-post_type menu-item-object-page {% if url == "/governance/" %}current-menu-item page_item page-item-256 current_page_item active {% endif %}menu-item-296"><a
+                                    title="Governance" href="{{ "/governance/" | prepend: site.baseurl }}">Governance</a></li>
+                        </ul>
+                    </li>
                     <li id="menu-item-22"
                         class="menu-item menu-item-type-post_type menu-item-object-page {% if url == "/security/" %}current-menu-item page_item page-item-20 current_page_item active {% endif %}menu-item-22"><a
                             title="Security" href="{{ "/security/" | prepend: site.baseurl }}">Security</a></li>
diff --git a/governance.md b/governance.md
new file mode 100644
index 0000000..3a34aa2
--- /dev/null
+++ b/governance.md
@@ -0,0 +1,44 @@
+---
+layout: general_page
+title: Governance
+permalink: /governance/
+---
+
+# Governance
+
+CloudRouter is a collaborative open source project, open to everyone. Critical to maintaining this openness is an open governance structure. CloudRouter's governance is primarily handled by two teams of volunteers: the Project Steering Committee (PSC) and the Technical Steering Committee (TSC). Both teams are run as meritocricies, and anyone can be elected by a vote of the existing members.
+
+## Project Steering Committee (PSC)
+
+The PSC provides overall guidance and strategy for the project, including but not limited to:
+
+* Legal compliance & licensing
+* Policies and procedures
+* Events and marketing
+* Developer and user outreach
+
+The PSC is currently comprised of the following members:
+
+* Jay Turner <jkt@iix.net>
+* David Jorm <djorm@iix.net>
+* Paul Gampe <pgampe@iix.net>
+
+New members of the PSC are currently being sought. If you are interested in applying, please email <cloudrouter-psc@googlegroups.com>.
+
+## Technical Steering Committee (TSC)
+
+The TSC provides technical leadership, direction, and decision making for the project. This includes, but is not limited to:
+
+* Code repos and coding standards
+* Design and operation of the build system
+* QE and testing procedures
+* Release engineering
+* Inclusion of packages
+
+The TSC is currently comprised of the following members:
+
+* Chandrasekar Kannan <ckannan@iix.net>
+* Arun Neelicattu <abn@iix.net>
+* Jay Turner <jkt@iix.net>
+
+New members of the TSC are currently being sought. If you are interested in applying, please email <cloudrouter-tsc@googlegroups.com>.
diff --git a/security.md b/security.md
index d340cab..5668b32 100644
--- a/security.md
+++ b/security.md
@@ -43,7 +43,7 @@ Anyone can post to this list. The subscribers are only trusted individuals who w
 #### Credit
 {% for reporter in advisory.reporters %}
 {% assign num_issues_reported = reporter.reported | size %}
-Issue{% if num_issues_reported > 1 %}s{% endif %} {{ reporter.reported | join: " " }} {% if num_issues_reported > 1 %}were{% else %}was{% endif %} reported by {{ reporter.name }} of {{reporter.affiliation }}.
+Issue{% if num_issues_reported > 1 %}s{% endif %} {{ reporter.reported | join: " " }} {% if num_issues_reported > 1 %}were{% else %}was{% endif %} reported by {{ reporter.name }}{% if reporter.affiliation != "" and reporter.affiliation != nil%} of {{reporter.affiliation }}{% endif %}.
 {% endfor %}
 
 {% endfor %}