diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..bab32ec
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,10 @@
+Contributions are more than welcome:
+
+- If you think you found a bug, create an issue and supply the minimum amount
+of code triggering the bug so it can be reproduced.
+- If you want to fix a bug, you can send a pull request. It should contains a
+new test or update an existing one to cover that bug.
+- If you think Gomail lacks a feature, you can open an issue or send a pull
+request. I want to keep Gomail code and API as simple as possible so please
+describe your needs so we can discuss whether this feature should be added to
+Gomail or not.
diff --git a/README.md b/README.md
index b6f45c1..0c970ec 100644
--- a/README.md
+++ b/README.md
@@ -74,11 +74,13 @@ bypass the verification of the server's certificate chain and host name by using
 Note, however, that this is insecure and should not be used in production.
 
 
+## Contribute
+
+See [CONTRIBUTING.md](CONTRIBUTING.md).
+
+
 ## Contact
 
-You are more than welcome to open issues and send pull requests if you find a
-bug or need a new feature.
-
-You can also ask questions on the [Gomail
+You can ask questions on the [Gomail
 thread](https://groups.google.com/d/topic/golang-nuts/ywPpNlmSt6U/discussion)
-in the Go mailing-list or via Twitter [@alexandrecesaro](https://twitter.com/alexandrecesaro).
+in the Go mailing-list.