diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index c220bce3b..2de8124ba 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,3 +1,13 @@
+# PROVIDER ISSUES
+
+**PLEASE NOTE:** Terraform has split out the builtin Providers into their own repositories. For any Provider issues, please open all issues and pull requests in the corresponding repository. An index of supported Providers can be found here:
+
+- https://github.com/terraform-providers
+
+All other issues (that appear to affect multiple or all providers) may be an issue with Terraform's core, and should be opened here. 
+
+------
+
 Hi there,
 
 Thank you for opening an issue. Please note that we try to keep the Terraform issue tracker reserved for bug reports and feature requests. For general usage questions, please see: https://www.terraform.io/community.html.
@@ -5,13 +15,6 @@ Thank you for opening an issue. Please note that we try to keep the Terraform is
 ### Terraform Version
 Run `terraform -v` to show the version. If you are not running the latest version of Terraform, please upgrade because your issue may have already been fixed.
 
-### Affected Resource(s)
-Please list the resources as a list, for example:
-- aws_instance
-- dnsimple_record
-
-If this issue appears to affect multiple resources, it may be an issue with Terraform's core, so please mention this.
-
 ### Terraform Configuration Files
 ```hcl
 # Copy-paste your Terraform configurations here - for large Terraform configs,