2 files changed, 67 insertions, 0 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 00000000..8c41c685
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,35 @@
+---
+name: Bug Report
+about: Report a problem you experienced with FIRRTL
+labels: improvement=BugFix
+---
+
+### Checklist
+
+- [ ] Did you specify the current behavior?
+- [ ] Did you specify the expected behavior?
+- [ ] Did you provide a code example showing the problem?
+- [ ] Did you describe your environment?
+- [ ] Did you specify relevant external information?
+
+### What is the current behavior?
+
+### What is the expected behavior?
+
+### Steps to Reproduce
+
+<!-- How can someone else reproduce the problem you're seeing? -->
+<!-- It's very helpful to include a full example of a failing Chisel or FIRRTL program! -->
+<!-- Include a stack trace if you have it! -->
+
+### Your environment
+
+<!-- Please tell us a little about your environment -->
+
+- Chisel Verions: <!-- e.g., 3.2.0 -->
+- OS: <!-- e.g., Linux knight 4.4.0-92-generic #115-Ubuntu SMP Thu Aug 10 09:04:33 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux -->
+- Verilator version: <!-- e.g., 4.008 -->
+
+### External Information
+
+<!-- Was this discussed anywhere else, e.g., Twitter, Gitter, StackOverflow? Provide direct links if available! -->
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
new file mode 100644
index 00000000..9f84d41d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,32 @@
+---
+name: Feature Request
+about: Request a new feature to be added to FIRRTL
+---
+
+### Checklist
+
+- [ ] Did you write out a description of the feature you want to see?
+- [ ] Did you look around for any related features?
+- [ ] Did you specify relevant external information?
+
+### Feature Description
+
+<!-- What type of behavior, API, or feature would you like FIRRTL to have? -->
+
+### Type of Feature
+
+<!-- Choose one or more from the following: -->
+<!--   - performance improvement            -->
+<!--   - documentation                      -->
+<!--   - code refactoring                   -->
+<!--   - code cleanup                       -->
+<!--   - backend code generation            -->
+<!--   - new feature/API                    -->
+
+### Related Features
+
+<!-- Is there anything in the codebase that can do this right now or is substantially related? -->
+
+### External Information
+
+<!-- Was this discussed anywhere else, e.g., Twitter, Gitter, StackOverflow? Provide direct links if available! -->