diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000..041742df4a
--- /dev/null
+++ b/ISSUE_TEMPLATE.md
@@ -0,0 +1,54 @@
+
+Please fill the info fields, it helps to get you faster support ;)
+
+if you have a stack dump decode it:
+https://github.com/esp8266/Arduino/blob/master/doc/Troubleshooting/stack_dump.md
+
+for better debug messages:
+https://github.com/esp8266/Arduino/blob/master/doc/Troubleshooting/debugging.md
+
+----------------------------- Remove above -----------------------------
+
+### Basic Infos
+
+#### Hardware
+Hardware:			?ESP-12?
+Core Version:      	?2.1.0-rc2?
+
+### Description
+
+Problem description
+
+### Settings in IDE
+
+Module:  			?Generic ESP8266 Module?
+Flash Size: 		?4MB/1MB?
+CPU Frequency:		?80Mhz?
+Flash Mode:			?qio?
+Flash Frequency:	?40Mhz?
+Upload Using:		?OTA / SERIAL?
+Reset Method:		?ck / nodemcu?
+
+
+### Sketch
+
+```cpp
+
+#include <Arduino.h>
+
+void setup() {
+
+}
+
+void loop() {
+
+}
+```
+
+### Debug Messages
+
+```
+messages here
+```
+
+