diff --git a/_config.yml b/_config.yml
index cae9a437..40bd09d5 100644
--- a/_config.yml
+++ b/_config.yml
@@ -4,6 +4,7 @@ description: Let the Scala compiler work for you. We provide type classes, insta
twitter: typelevel
email: info@typelevel.org
gitter: "https://gitter.im/orgs/typelevel/rooms"
+discord: "https://sca.la/typeleveldiscord"
google_groups: "https://groups.google.com/group/typelevel"
baseurl: https://typelevel.org
googlemaps_apikey: "AIzaSyAgMQPpkd_Qq-NYcCggh28PaS82oG-9YoA"
diff --git a/about.html b/about.html
index 67ea618b..9cd24270 100644
--- a/about.html
+++ b/about.html
@@ -13,8 +13,8 @@ Contact
Twitter
-
- Gitter
+
+ Discord
diff --git a/conduct.md b/conduct.md
index edf82a77..a318a98d 100644
--- a/conduct.md
+++ b/conduct.md
@@ -19,7 +19,8 @@ Community staff will be happy to help participants contact local law enforcement
We expect participants to follow these rules at all Typelevel-supported venues --including online venues-- and social events associated with Typelevel. These venues include but are not necessarily limited to:
-- All GitHub repositories and comments under the [Typelevel organization](https://github.com/typelevel)
+- All GitHub repositories and comments under the [Typelevel organization](https://github.com/typelevel),
+- All Discord channels under the [Typelevel organization]({{ site.discord }}),
- All Gitter channels under the [Typelevel organization]({{ site.gitter }}),
- The #typelevel IRC channel on Freenode,
- The [Typelevel Google Group]({{ site.google_groups }}), and
diff --git a/css/main.scss b/css/main.scss
index d83497cd..fdad14ef 100644
--- a/css/main.scss
+++ b/css/main.scss
@@ -794,6 +794,10 @@ blockquote {
background-image: url('../img/ico-twitter.png');
background-size: 32px 32px;
}
+.contact__item--discord {
+ background-image: url('../img/ico-discord.svg');
+ background-size: 32px 32px;
+}
.contact__item--gitter {
background-image: url('../img/ico-gitter.svg');
background-size: 32px 32px;
diff --git a/img/ico-discord.svg b/img/ico-discord.svg
new file mode 100644
index 00000000..3efe1ec1
--- /dev/null
+++ b/img/ico-discord.svg
@@ -0,0 +1,10 @@
+