diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 594aa8b29e..f86d7d2287 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -18,10 +18,7 @@ First off, thanks for taking the time to contribute!
 
 ## Bug reports
 
-We used to use Sourceforge for bug tracking, but we are in the process of moving to github issues.
-
-*   Old bugs are still available at <https://sourceforge.net/p/pmd/bugs/>.
-*   Please report new bugs at <https://github.com/pmd/pmd/issues>.
+We use the issue tracker on Github. Please report new bugs at <https://github.com/pmd/pmd/issues>.
 
 When filing a bug report, please provide as much information as possible, so that we can reproduce the issue:
 
@@ -32,7 +29,7 @@ When filing a bug report, please provide as much information as possible, so tha
 
 ## Documentation
 
-There is some documentation available under <https://pmd.github.io/pmd>. Feel free to create a bug report if
+There is some documentation available under <https://pmd.github.io/latest>. Feel free to create a bug report if
 documentation is missing, incomplete or outdated. See [Bug reports](#bug-reports).
 
 The documentation is generated as a Jekyll site, the source is available at: <https://github.com/pmd/pmd/tree/master/docs>. You can find build instructions there.
@@ -42,18 +39,18 @@ For more on contributing documentation check <https://pmd.github.io/pmd/pmd_devd
 
 There are various channels, on which you can ask questions:
 
-*   The mailing list: [pmd-devel](https://lists.sourceforge.net/lists/listinfo/pmd-devel)
-
-*   The discussion forums on sourceforge: <https://sourceforge.net/p/pmd/discussion/>
-
 *   On [StackOverflow](https://stackoverflow.com/questions/tagged/pmd): Make sure, to tag your question with "pmd".
 
+*   Create a issue for your question at <https://github.com/pmd/pmd/issues>.
+
+*   Ask your question on Gitter <https://gitter.im/pmd/pmd>.
+
 ## Code Style
 
 PMD uses [checkstyle](http://checkstyle.sourceforge.net/) to enforce a common code style.
 
-See [pmd-checkstyle-config.xml](https://github.com/pmd/build-tools/blob/master/config/src/main/resources/net/sourceforge/pmd/pmd-checkstyle-config.xml) for the configuration and
-[the eclipse configuration files](https://github.com/pmd/build-tools/tree/master/config/eclipse) that can
+See [pmd-checkstyle-config.xml](https://github.com/pmd/build-tools/blob/master/src/main/resources/net/sourceforge/pmd/pmd-checkstyle-config.xml) for the configuration and
+[the eclipse configuration files](https://github.com/pmd/build-tools/tree/master/eclipse) that can
 be imported into a fresh workspace.
 
 
diff --git a/README.md b/README.md
index e89fa6db57..dbfbd7d9ca 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,16 @@ Additionally it includes **CPD**, the copy-paste-detector. CPD finds duplicated
 C/C++, C#, Dart, Fortran, Go, Groovy, Java, JavaScript, JSP, Kotlin, Lua, Matlab, Modelica,
 Objective-C, Perl, PHP, PLSQL, Python, Ruby, Salesforce.com Apex, Scala, Swift and Visualforce.
 
-## Source and Documentation
+## Support
+
+*   How do I? -- Ask a question on [StackOverflow](https://stackoverflow.com/questions/tagged/pmd).
+*   I got this error, why? -- Ask a question on [StackOverflow](https://stackoverflow.com/questions/tagged/pmd).
+*   I got this error and I'm sure it's a bug -- file an [issue](https://github.com/pmd/pmd/issues).
+*   I have an idea/request/question -- file an [issue](https://github.com/pmd/pmd/issues).
+*   I have a quick question -- ask on our [Gitter chat](https://gitter.im/pmd/pmd).
+*   Where's your documentation? -- <https://pmd.github.io/latest/>
+
+## Source
 
 Our latest source of PMD can be found on [GitHub](https://github.com/pmd/pmd). Fork us!
 
@@ -26,6 +35,6 @@ The rule designer is developed over at [pmd/pmd-designer](https://github.com/pmd
 Please see [its README](https://github.com/pmd/pmd-designer#contributing) for
 developer documentation.
 
-## News and Website
+## Website
 
-More information can be found on our [Website](https://pmd.github.io) and on [SourceForge](https://sourceforge.net/projects/pmd/).
+More information can be found on our [Website](https://pmd.github.io).