diff --git a/docs/config.toml b/docs/config.toml
index 0bc9e4b11..90dc3601e 100644
--- a/docs/config.toml
+++ b/docs/config.toml
@@ -1,4 +1,4 @@
-baseurl = "http://hugo.spf13.com"
+baseurl = "http://gohugo.io"
MetaDataFormat = "yaml"
[indexes]
@@ -14,7 +14,12 @@ MetaDataFormat = "yaml"
name = "Showcase"
pre = ""
url = "/showcase/"
- weight = -200
+ weight = -180
+[[menu.main]]
+ name = "Discuss Hugo"
+ pre = ""
+ url = "http://discuss.gohugo.io"
+ weight = -150
[[menu.main]]
name = "about hugo"
pre = ""
@@ -54,3 +59,8 @@ MetaDataFormat = "yaml"
name = "community"
pre = ""
weight = -50
+[[menu.main]]
+ parent = "community"
+ name = "Discussion Forum"
+ url = "http://discuss.gohugo.io"
+ weight = 150
diff --git a/docs/content/community/mailing-list.md b/docs/content/community/mailing-list.md
index c1a268dbd..fa0150f3e 100644
--- a/docs/content/community/mailing-list.md
+++ b/docs/content/community/mailing-list.md
@@ -9,6 +9,14 @@ title: Mailing List
weight: 10
---
+# Discussion Forum
+
+Hugo has it’s own [discussion forum](http://discuss.gohugo.io) powered by [Discourse](http://www.discourse.org/)
+
+Please use this for all discussions, questions, etc.
+
+# Mailing List
+
Hugo has two mailing lists:
## Announcements
@@ -16,11 +24,15 @@ Very low traffic. Only releases will be emailed here.
https://groups.google.com/forum/#!forum/hugo-announce
-## Discussion
-For all questions and discussions:
+## Discussion (Archive)
+
+**This has been replaced with the [Hugo discussion forum](http://discuss.gohugo.io).**
+
+It is available for archival purposes.
https://groups.google.com/forum/#!forum/hugo-discuss
+
# Other Resources
## GoNuts
diff --git a/docs/content/overview/introduction.md b/docs/content/overview/introduction.md
index 4ac2ee337..af5d97243 100644
--- a/docs/content/overview/introduction.md
+++ b/docs/content/overview/introduction.md
@@ -122,3 +122,5 @@ as I have writing it.
* [Quick start](/overview/quickstart)
* [Join the Mailing List](/community/mailing-list)
* [Star us on GitHub](http://github.com/spf13/hugo)
+ * [Discussion Forum](http://discuss.gohugo.io)
+