diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index e9399f9153e..22cee3e0d82 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,18 +1,23 @@
-Version/Platform/Processor information (from `ipfs version --all`):
+<!-- Output From `ipfs version --all`) -->
+#### Version information:
 
+<!-- Bug, Feature, Enhancement, Etc -->
+#### Type:
 
+<!-- from `P0` "Critical" to `P5` "Relatively Unimportant") -->
+#### Priority:
 
-Type (bug, feature, meta, test failure, question):
-Area (api, commands, daemon, fuse, etc):
-Priority (from P0: operations on fire, to P4: functioning):
+#### Description:
 
-Description:
 
 
 
 
----------------------------------------------------
+
+
+<!--
 This is for you! Please read, and then delete this text before posting it.
 The go-ipfs issues are only for bug reports and directly actionable features.
-Check https://github.com/ipfs/community/blob/master/contributing.md#reporting-issues if that doesn't fit.
-Check https://github.com/ipfs/go-ipfs/blob/master/docs/github-issue-guide.md if you are not sure how to fill this issue.
+Read https://github.com/ipfs/community/blob/master/contributing.md#reporting-issues if your issue doesn't fit either of those categories.
+Read https://github.com/ipfs/go-ipfs/blob/master/docs/github-issue-guide.md if you are not sure how to fill in this issue.
+-->
\ No newline at end of file
diff --git a/contribute.md b/contribute.md
index f7c2477701c..1b1a85e2f25 100644
--- a/contribute.md
+++ b/contribute.md
@@ -1,8 +1,11 @@
 # Contribute
 
 go-ipfs is MIT licensed open source software. We welcome contributions big and
-small! Take a look at the [community contributing notes](https://github.com/ipfs/community/blob/master/contributing.md). Please make sure to check the [issues](https://github.com/ipfs/go-ipfs/issues). Search the closed ones
-before reporting things, and help us with the open ones.
+small! Take a look at the [community contributing notes](https://github.com/ipfs/community/blob/master/contributing.md). 
+
+Please make sure to check out the [issues](https://github.com/ipfs/go-ipfs/issues). Search the closed ones before reporting things, and (if you can!) help us with open ones.
+
+Please note that the go-ipfs issues are only for bug reports and directly actionable features. Check [the IPFS Community guide on reporting issues](https://github.com/ipfs/community/blob/master/contributing.md#reporting-issues) if your question doesn't fit as a bug report or an actionable feature, and our [guide on opening issues](https://github.com/ipfs/go-ipfs/blob/master/docs/github-issue-guide.md) if you are not sure how to make an issue here.
 
 If you're looking to help out, head to the [captain's log](https://github.com/ipfs/go-ipfs/issues/2247) and
 try picking up an issue from there.