diff --git a/bugs/index.md b/bugs/index.md
index c7cd2f8506..b1c0e3421b 100644
--- a/bugs/index.md
+++ b/bugs/index.md
@@ -10,11 +10,13 @@ type: markdown
 
 Oh no! You found a bug? Here's what you need to do:
 
-1. Check out the [istio-users](https://groups.google.com/forum/#!forum/istio-users) group mailing list. You can easily search to
+1. Check out the [troubleshooting guide]({{home}}/troubleshooting) for solutions to common problems.
+
+2. Check out the [istio-users](https://groups.google.com/forum/#!forum/istio-users) group mailing list. You can easily search to
 see if someone else has already encountered the problem. Maybe there's a simple workaround you can use until the bug has been fixed.
 
-2. If you did't find any info on istio-users about your problem, file an issue on [GitHub](https://github.com/istio/istio.github.io/issues/new) so
+3. If you did't find any info on istio-users about your problem, file an issue on [GitHub](https://github.com/istio/istio.github.io/issues/new) so
 the development team is made aware of the problem and can get it fixed.
 
-3. If the problem you're dealing with needs immediate attention, don't hesitate to hop on [Slack](https://istio.slack.com)
+4. If the problem you're dealing with needs immediate attention, don't hesitate to hop on [Slack](https://istio.slack.com)
 to get interactive responses from the community and the main Istio development team.
diff --git a/faq/index.md b/faq/index.md
index eafab9e457..9527784bf1 100644
--- a/faq/index.md
+++ b/faq/index.md
@@ -45,6 +45,11 @@ cluster, please refer to our [Installation]({{home}}/docs/tasks/installing-istio
 
 Istio uses the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0.html).
 
+#### How was Istio started?
+
+The Istio project was started by teams from Google and IBM in partnership with the Envoy team from Lyft. It's been
+developed fully in the open on GitHub.
+
 #### What deployment environments are supported?
 
 Istio is designed and built to be platform-independent. For our {{ site.data.istio.version }} release, however, Istio only supports environments running 
@@ -79,13 +84,7 @@ Detailed developer-level documentation is maintained for each component in GitHu
 
 #### Istio doesn't work - what do I do?
 
-Follow the [instructions](https://github.com/istio/istio/blob/master/CONTRIBUTING.md#issues) to open an issue [here](https://github.com/istio/istio/issues/new) or ask questions
-on [slack](https://istio.slack.com/messages/C524NCGR1/).
-
-Our [user mailing list](https://groups.google.com/forum/#!forum/istio-users) is another great way to get help and answers. We also monitor [Stack Overflow](https://stackoverflow.com/questions/tagged/istio) for questions tagged with "istio".
-
-Additionally, we provide [Reference Guides]({{home}}/docs/reference/) for all of the Istio components. These can be helpful when troubleshooting issues with 
-configuration, etc.
+Check out our [bug reporting]({{home}}/bugs) page for information of finding solutions and filing bugs.
 
 #### What does the {{ site.data.istio.version }} release cover?