diff --git a/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
similarity index 100%
rename from CODE_OF_CONDUCT.md
rename to .github/CODE_OF_CONDUCT.md
diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md
similarity index 68%
rename from CONTRIBUTING.md
rename to .github/CONTRIBUTING.md
index 1dcf5e1..15ce441 100644
--- a/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -4,6 +4,17 @@
 
 If you would like to support this project, have an interesting idea how to improve the operation of this tool, or if you found some errors - fork this, add your fixes, and add a pull request of your branch to the **master branch**.
 
+## Using the issue tracker
+
+The [issue tracker](https://github.com/trimstray/iptables-essential/issues) is
+the preferred channel for bug reports, features requests and submitting pull requests, but please respect the following restrictions:
+
+* Please **do not** use the issue tracker for personal support requests (use
+  [Stack Overflow](https://stackoverflow.com) or IRC)
+
+* Please **do not** derail or troll issues. Keep the discussion on topic and
+  respect the opinions of others
+
 ## Signature of commit
 
 Moving forward all commits to this project must include a "signed-off-by" line indicating the name and email address of the contributor signing off on the change. To enable signatures add the following lines to `.git/hooks/prepare-commit-msg` :