diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index a1cbb9a984..42add43923 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,11 +1,14 @@
 <!--
 
-Please fill in these details so that we can help you!
+BEFORE SUBMITTING A NEW ISSUE, PLEASE READ THE FAQ!!
+https://github.com/PowerShell/vscode-powershell/wiki/FAQ
 
-If you are filing an issue related to PowerShell syntax coloring/highlighting,
-please file it at the EditorSyntax repo:
+If your issue is not addressed by the FAQ, please
+fill in the following details so that we can help you!
 
-https://github.com/PowerShell/EditorSyntax/issues
+The more repro details you can provide, along with a zip
+of the log files from your session, the better the chances
+are for a quick resolution.
 
 -->
 
@@ -17,7 +20,7 @@ https://github.com/PowerShell/EditorSyntax/issues
 - Output from `$PSVersionTable`:
 
 ```
-Copy / paste the below commands into the PowerShell Integrated Terminal, and paste the output here
+Copy / paste the following commands into the PowerShell Integrated Console, and paste the output here:
 
 code -v
 $pseditor.EditorServicesVersion
diff --git a/README.md b/README.md
index 9cbe243907..64f5ef8e2e 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,8 @@ that Visual Studio Code provides.
 Read the [installation instructions](https://github.com/PowerShell/PowerShell/blob/master/docs/learning-powershell/using-vscode.md)
 to get more details on how to use the extension on these platforms.
 
+Read the [FAQ](https://github.com/PowerShell/vscode-powershell/wiki/FAQ) for answers to common questions.
+
 ## Features
 
 - Syntax highlighting