diff --git a/.github/issue_template.md b/.github/issue_template.md
new file mode 100644
index 000000000..05e1b5fab
--- /dev/null
+++ b/.github/issue_template.md
@@ -0,0 +1,16 @@
+* [x] bug
+* [ ] enhancement
+* version: <!-- exact release version. PHP version, OS, web server if relevant -->
+
+### Description
+...
+
+### Steps To Reproduce
+... If possible a minimal demo of the problem ...
+
+<!--
+REMEMBER, AN ISSUE IS NOT THE PLACE TO ASK QUESTIONS. We will be happy to help you on forum https://forum.nette.org or chat with us on Gitter https://gitter.im/nette/nette
+
+A good bug report shouldn't leave others needing to chase you up for more information. Please try to be as detailed as possible in your report.
+Feature requests are welcome. Explain your intentions. It's up to you to make a strong case to convince the project's developers of the merits of this feature.
+-->
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 000000000..7ea34446c
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,12 @@
+* [ ] bug fix   <!-- #issue numbers, if any -->
+* [ ] enhancement
+* [ ] BC breaks
+* [ ] doc PR nette/docs#...  <!-- highly welcome, see https://nette.org/en/writing -->
+
+<!--
+Describe your changes here to communicate to the maintainers why we should accept this pull request.
+
+Please add new tests to show the fix or feature works. And take a moment to read the contributing guide https://nette.org/en/contributing
+
+Thanks for contributing to Nette!
+-->
diff --git a/contributing.md b/contributing.md
index 860882bf7..184152c02 100644
--- a/contributing.md
+++ b/contributing.md
@@ -1,27 +1,33 @@
 How to contribute & use the issue tracker
 =========================================
 
-The issue tracker is the preferred channel for bug reports, features requests
-and submitting pull requests, but please respect the following restrictions:
+Nette welcomes your contributions. There are several ways to help out:
 
-* Please **do not** use the issue tracker for personal support requests (use
-  [Nette forum](https://forum.nette.org) or [Stack Overflow](http://stackoverflow.com)).
+* Create an issue on GitHub, if you have found a bug
+* Write test cases for open bug issues
+* Write fixes for open bug/feature issues, preferably with test cases included
+* Contribute to the [documentation](https://nette.org/en/writing)
 
-* Please **do not** derail or troll issues. Keep the discussion on topic and
-  respect the opinions of others.
+Issues
+------
 
-* Use the GitHub **issue search** &mdash; check if the issue has already been
-   reported.
+Please **do not use the issue tracker to ask questions**. We will be happy to help you
+on [Nette forum](https://forum.nette.org) or chat with us on [Gitter](https://gitter.im/nette/nette).
 
-A good **bug report** shouldn't leave others needing to chase you up for more
+A good bug report shouldn't leave others needing to chase you up for more
 information. Please try to be as detailed as possible in your report.
 
 **Feature requests** are welcome. But take a moment to find out whether your idea
 fits with the scope and aims of the project. It's up to *you* to make a strong
 case to convince the project's developers of the merits of this feature.
 
-Nette welcomes **pull requests**. If you'd like to contribute, please take a moment
-to [read the guidelines](https://nette.org/en/contributing) in order to make
-the contribution process easy and effective for everyone involved.
+Contributing
+------------
 
-Thanks!
+If you'd like to contribute, please take a moment to read [the contributing guide](https://nette.org/en/contributing).
+
+The best way to propose a feature is to discuss your ideas on [Nette forum](https://forum.nette.org) before implementing them.
+
+Please do not fix whitespace, format code, or make a purely cosmetic patch.
+
+Thanks! :heart: