diff --git a/about/Makefile b/about/Makefile
index bc64dfa..6201f7f 100644
--- a/about/Makefile
+++ b/about/Makefile
@@ -1,6 +1,6 @@
 FILES = index.html exec.html members.html constitution.html donations.html \
-	positions.html constitution-change-20020920.html \
-	constitution-change-20040205.html
+	code-of-conduct.html positions.html \
+	constitution-change-20020920.html constitution-change-20040205.html
 RELDIR = about/
 include ../common.mk
 
diff --git a/about/code-of-conduct.xml b/about/code-of-conduct.xml
new file mode 100644
index 0000000..613db18
--- /dev/null
+++ b/about/code-of-conduct.xml
@@ -0,0 +1,247 @@
+<?xml version='1.0'?>
+
+<!DOCTYPE cscpage SYSTEM "../csc.dtd">
+
+<cscpage title="Code of Conduct for the Computer Science Club of the University of Waterloo">
+
+<header />
+
+<section title="Code of Conduct" anchor="title">
+</section>
+
+<section title="Purpose" anchor="purpose">
+  <p>
+    One of the primary goals of the Computer Science Club of the University
+    of Waterloo is the inclusion and support of all members of the University
+    of Waterloo community who are interested in Computer Science. As such, we
+    are committed to providing a friendly, safe and welcoming environment for
+    all, regardless of gender, sex, sexual orientation, ability, ethnicity,
+    socioeconomic status, age, and religion or lack thereof.
+  </p>
+  <p>
+    We invite all those who participate in our events and who communicate with
+    our community at large to help us create a safe and positive experience for
+    everyone involved.
+  </p>
+  <p>
+    We've outlined a code of conduct to highlight our expectations for all
+    individuals who participate in our community, as well as the steps to
+    handle unacceptable behaviour.
+  </p>
+</section>
+
+<section title="Expected Behaviour" anchor="expected-behaviour">
+  <ul>
+    <li>
+      Participate in an authentic and active way. In doing so, you contribute
+      to the health and longevity of this community.
+    </li>
+    <li>
+      Exercise consideration and respect in your speech and actions.
+    </li>
+    <li>
+      Attempt collaboration before conflict.
+    </li>
+    <li>
+      Refrain from demeaning, discriminatory, or harassing behaviour and speech.
+    </li>
+    <li>
+      Be mindful of your surroundings and of your fellow participants.
+    </li>
+  </ul>
+</section>
+
+<section title="Unacceptable Behaviour" anchor="unacceptable">
+  <p>
+    <strong>Unacceptable behaviours include</strong>: intimidating,
+    harassing, abusive, discriminatory, derogatory or demeaning
+    speech or actions by any participant in our community online, at all
+    related events and in one-on-one communications carried out in the
+    context of community business. Community event venues may be shared;
+    please be respectful to all patrons of these locations.
+  </p>
+  <p>
+    <strong>Harassment includes</strong>: harmful or prejudicial verbal or
+    written comments related to gender, sexual orientation, race, religion,
+    disability; inappropriate use of nudity and/or sexual images in public
+    spaces (including presentation slides); deliberate intimidation, stalking
+    or following; harassing photography or recording; sustained disruption of
+    talks or other events; inappropriate physical contact, and unwelcome
+    sexual attention.
+  </p>
+</section>
+
+<section title="Experiencing Unacceptable Behaviour" anchor="experiencing">
+  <p>
+    The Executive Council and Faculty Advisor are herein referred to as the
+    Officers, or singularly as Officer.
+  </p>
+  <p>
+    If you notice a dangerous situation, someone in distress, or violations of
+    this Code of Conduct, <a href="../about/">contact an Officer</a>. No
+    situation is considered inconsequential. If you do not feel comfortable
+    contacting an Executive Council member due to the nature of the incident,
+    you may contact the <a href="../about/exec#advisor">Faculty Advisor</a>.
+  </p>
+  <p>
+    Upon receiving a complaint the Officer will inform the first of the
+    following people who is not personally involved in the situation, or in a
+    close relationship with the someone involved in the situation and is
+    available, and this person shall handle the complaint and shall here after
+    be referred to as the Handling Officer.
+    <ol>
+      <li>
+        The President
+      </li>
+      <li>
+        The Vice President
+      </li>
+      <li>
+        Any other Executive Council Member
+      </li>
+      <li>
+        The Faculty Advisor
+      </li>
+    </ol>
+  </p>
+  <p>
+    The Handling Officer will interview the subject of the complaint and any
+    witnesses and consult with other relevant Officers. The Handling Officer
+    shall always consult with at least one other Officer.
+  </p>
+</section>
+
+<section title="Consequences of Unacceptable Behaviour" anchor="consequences">
+  <p>
+    After having done so, the Handling Officer shall use their best judgment to
+    determine if the complaint is valid and, if so, determine with the relevant
+    Officers the appropriate action to ensure that the complainant feels
+    welcome in the Computer Science Club community and to avoid a subsequent
+    incident:
+    <ul>
+      <li>
+        A warning.
+      </li>
+      <li>
+        A suspension from the events and spaces governed by the Code of Conduct
+        until the beginning of the next term. If the suspension would come into
+        effect less than two full weeks from the end of class, then the
+        suspension applies to the subsequent term as well.
+      </li>
+      <li>
+        If the incident is very serious, or the subject has a pattern of
+        similar offences, expulsion from the Club.
+      </li>
+    </ul>
+  </p>
+  <p>
+    The Handling Officer shall inform the complainant of the resolution of the
+    issue and inform both the complainant and the subject of their right to
+    appeal the decision.
+  </p>
+</section>
+
+<section title="Addressing Grievances" anchor="grievances">
+  <p>
+    If either the complainant or the subject disagree with the decision made by
+    the Handling Officer, they can appeal to the Officers, who can overturn the
+    decision with a majority vote.
+  </p>
+  <p>
+    No Officer who was personally involved in the complaint, or is in a close
+    relationship with someone involved in the complaint, shall participate in
+    the Officers deliberation or vote on the appeal, nor shall they be counted
+    as a member when determining the quorum required to hear and decide on the
+    appeal.
+  </p>
+  <p>
+    If the subject of a complaint is expelled from the Club, then at their
+    request, but no more often then once a year, the Officers will review the
+    decision to expel them from the Club. The Officers can reinstate the
+    subject with a two-thirds vote of the Officers.
+  </p>
+</section>
+
+<section title="Confidentiality" anchor="confidential">
+  <p>
+    The Club recognizes that all members have a right to privacy, and will
+    handle complaints confidentially.
+  </p>
+  <p>
+    <strong>Information that will be kept in Club records and be available to
+    Officers in the future will be limited to</strong>: the date the complaint
+    was made, the name of the subject of the complaint, the name of the
+    Handling Officer, the decision made on the complaint, the date the decision
+    on the complaint was made, and if applicable, the date of the appeal, the
+    party making the appeal (Complainant or Subject), the decision made on the
+    appeal by the Officers, and the date of the Officers decision on the appeal.
+  </p>
+  <p>
+    <strong>The information the Handling Officer will keep records of, in
+    addition to the information kept in the Club records, will be limited to
+    </strong>: the name of the complainant, and a summary of the complaint.
+    This information will be available to Officers that are handling future
+    complaints if it is requested and the Handling Officer deems it relevant to
+    the new complaint.
+  </p>
+</section>
+
+<section title="Scope" anchor="scope">
+  <ul>
+    <li>
+      We expect all community participants (participants, organizers, sponsors,
+      and other guests) to abide by this Code of Conduct in all community
+      venues (online and in-person) as well as in all one-on-one communications
+      pertaining to community business.
+    </li>
+    <li>
+      Events co-organized with the Computer Science Club are governed by our
+      Code of Conduct.
+    </li>
+  </ul>
+</section>
+
+<section title="Contact Information" anchor="contact">
+  <ul>
+    <li>
+      The Computer Science Club <a href="../about/">Officers can be contacted as a whole</a>.
+    </li>
+  </ul>
+</section>
+
+<section title="Additional Information" anchor="info">
+  <p>
+    Additionally, the Executive Council are available to help community members
+    engage with local law enforcement or to otherwise help those experiencing
+    unacceptable behaviour feel safe. In the context of in-person events,
+    organizers will also provide escorts as desired by the person experiencing
+    distress.
+  </p>
+</section>
+
+<section title="License Information And Attribution" anchor="license-attribution">
+  <ul>
+    <li>
+      The Code of Conduct is distributed under a
+      <a href="http://creativecommons.org/licenses/by-sa/3.0/">
+        Creative Commons Attribution-ShareAlike License
+      </a>, derived from the
+      <a href="http://wics.uwaterloo.ca/code-of-conduct/">
+        Women in Computer Science Code of Conduct
+      </a>, the
+      <a href="http://uwarc.uwaterloo.ca/policies-procedures/code-of-conduct/">
+        UW Amateur Radio Club Code of Conduct
+      </a>, and the
+      <a href="http://fass.uwaterloo.ca/wp-content/uploads/2015/03/constitution.pdf">
+        FASS Code of Conduct (Article 2, Section 16)
+      </a>.
+    </li>
+  </ul>
+</section>
+
+<section title="Revision" anchor="revision">
+  <p>Revision 1.0, adopted by the Computer Science Club of the University of Waterloo on 27 March 2015.</p>
+</section>
+
+<footer/>
+</cscpage>
diff --git a/about/constitution.xml b/about/constitution.xml
index 0710cd0..534175a 100644
--- a/about/constitution.xml
+++ b/about/constitution.xml
@@ -383,7 +383,22 @@
   </ol>
 </section>
 
-<section title="12. Use of Club Resources" anchor="resources">
+<section title="12. Code of Conduct" anchor="conduct">
+  <ol>
+    <li>
+      The Club has a <a href="code-of-conduct">Code of Conduct</a>.
+    </li>
+    <li>
+      The <a href="code-of-conduct#scope">scope of the Code of Conduct</a> is specified by the Code of Conduct.
+    </li>
+    <li>
+      Changes to the Code of Conduct are governed by the same rules as changes
+      to the Constitution.
+    </li>
+  </ol>
+</section>
+
+<section title="13. Use of Club Resources" anchor="resources">
   <ol>
     <li> All resources under control of the Club are to be used in accordance
       with the aims of the Club.</li>
@@ -408,7 +423,7 @@
 </section>
 
 <section title="Revision" anchor="revision">
-  <p>The constitution was last revised on 19 September 2014.</p>
+  <p>The constitution was last revised on 27 March 2015.</p>
 </section>
 
 <footer/>
diff --git a/about/directory.xml b/about/directory.xml
index 4ef3e89..b7247ff 100644
--- a/about/directory.xml
+++ b/about/directory.xml
@@ -4,6 +4,7 @@
 
 <directory title="About">
  <diritem title="Constitution" href="constitution" />
+ <diritem title="Code of Conduct" href="code-of-conduct" />
  <diritem title="Positions" href="positions" />
  <diritem title="Membership List" href="members" />
  <diritem title="Donations" href="donations" />
