diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index fa7c45bbb104..4bc2fd05c909 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,23 +1,38 @@
-> Please provide us with the following information:
-> ---------------------------------------------------------------
-
-### OS?
-> Windows 7, 8 or 10. Linux (which distribution). Mac OSX (Yosemite? El Capitan?)
+<!--
+IF YOU DON'T FILL OUT THE FOLLOWING INFORMATION YOUR ISSUE MIGHT BE CLOSED WITHOUT INVESTIGATING
+-->
+### Bug Report or Feature Request (mark with an `x`)
+- [ ] bug report -> please search issues before submitting
+- [ ] feature request
 
 
 ### Versions.
-> Please run `ng --version`. If there's nothing outputted, please run in a Terminal: `node --version` and paste the result here:
+<!--
+Output from: `ng --version`.
+If nothing, output from: `node --version` and `npm --version`.
+  Windows (7/8/10). Linux (incl. distribution). macOS (El Capitan? Sierra?)
+-->
 
 
 ### Repro steps.
-> Was this an app that wasn't created using the CLI? What change did you do on your code? etc.
+<!--
+Simple steps to reproduce this bug.
+Please include: commands run, packages added, related code changes.
+A link to a sample repo would help too.
+-->
 
 
 ### The log given by the failure.
-> Normally this include a stack trace and some more information.
+<!-- Normally this include a stack trace and some more information. -->
+
+
+### Desired functionality.
+<!--
+What would like to see implemented?
+What is the usecase?
+-->
 
 
 ### Mention any other details that might be useful.
+<!-- Please include a link to the repo if this is related to an OSS project. -->
 
-> ---------------------------------------------------------------
-> Thanks! We'll be in touch soon.