diff --git a/CONTRIBUTING.markdown b/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.markdown
rename to CONTRIBUTING.md
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
new file mode 100644
index 000000000..52e143510
--- /dev/null
+++ b/ISSUE_TEMPLATE.md
@@ -0,0 +1,37 @@
+Check before submitting issue -- Thank you!
+
+You can ignore this form if this issue is a feature request.
+
+## Expected behavior
+
+## Actual behavior
+
+## Steps to reproduce
+
+## Extra info
+
+Android version: (version code here)
+
+Network type:
+
+- [ ] Cellular
+- [ ] Wi-Fi
+
+App version: (version code here)
+
+Build variant:
+
+- [ ] Google
+- [ ] F-Droid
+
+Microblogging service:
+
+- [ ] Twitter
+- [ ] Fanfou
+- [ ] GNU Social / StatusNet
+
+App settings:
+
+- [ ] Custom API
+- [ ] Connected through proxy
+- [ ] Media preview enabled
diff --git a/README.markdown b/README.md
similarity index 100%
rename from README.markdown
rename to README.md