diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to .github/CONTRIBUTING.md
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 000000000..862367e32
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,10 @@
+<!-- Thank you for submitting an issue! -->
+
+
+
+<!-- Please fill following if applicable, delete otherwise: -->
+******
+-   Operating system: linux / mac / win
+-   `concurrent-ruby` version: x.y.z
+-   `concurrent-ruby-ext` installed: yes / no
+-   `concurrent-ruby-edge` used: yes / no