diff --git a/src/site/markdown/index.md.vm b/src/site/markdown/index.md.vm
index f95dea8d47..c955192794 100644
--- a/src/site/markdown/index.md.vm
+++ b/src/site/markdown/index.md.vm
@@ -5,7 +5,7 @@
 Welcome to PMD
 ==============
 
-PMD scans Java source code and looks for potential problems like:
+PMD scans source code in Java and other languages and looks for potential problems like:
 
 *   Possible bugs - empty try/catch/finally/switch statements
 *   Dead code - unused local variables, parameters and private methods
diff --git a/src/site/markdown/overview/changelog.md b/src/site/markdown/overview/changelog.md
index 27495cfc63..9581d167d2 100644
--- a/src/site/markdown/overview/changelog.md
+++ b/src/site/markdown/overview/changelog.md
@@ -4,6 +4,8 @@
 
 **New Supported Languages:**
 
+*   CPD supports now Swift (see [PR#33](https://github.com/adangel/pmd/pull/33)).
+
 **Feature Request and Improvements:**
 
 *   A JSON-renderer for PMD which is compatible with CodeClimate. See [PR#83](https://github.com/pmd/pmd/pull/83).
@@ -20,6 +22,7 @@
 *   [#30](https://github.com/adangel/pmd/pull/30): Removed file filter for files that are explicitly specified on the CPD command line using the '--files' command line option.
 *   [#31](https://github.com/adangel/pmd/pull/31): Added file encoding detection to CPD.
 *   [#32](https://github.com/adangel/pmd/pull/32): Extended Objective-C grammar to accept UTF-8 escapes (\uXXXX) in string literals.
+*   [#33](https://github.com/adangel/pmd/pull/33): Added support for Swift to CPD.
 *   [#79](https://github.com/pmd/pmd/pull/79): do not flag public static void main(String[]) as UseVarargs; ignore @Override for UseVarargs
 *   [#80](https://github.com/pmd/pmd/pull/80): Update mvn-plugin.md
 *   [#83](https://github.com/pmd/pmd/pull/83): Adds new Code Climate-compliant JSON renderer
diff --git a/src/site/markdown/usage/cpd-usage.md b/src/site/markdown/usage/cpd-usage.md
index d43f8d8e30..1dc190f3cf 100644
--- a/src/site/markdown/usage/cpd-usage.md
+++ b/src/site/markdown/usage/cpd-usage.md
@@ -31,7 +31,10 @@ CPD has been through three major incarnations:
 Each rewrite made it much faster, and now it can process the JDK 1.4 java.* packages in about 4 seconds
 (on my workstation, at least).
 
-Note that CPD works with Java, JSP, C, C++, C#, Fortran and PHP code. Your own language is missing?
+Note that CPD works with Java, JSP, C, C++, C#, Fortran and PHP code and some more languages. For the
+full list, see below [Supported Languages](#Supported_Languages).
+
+Your own language is missing?
 See how to add it [here](../customizing/cpd-parser-howto.html).
 
 CPD is included with PMD, which you can download [here](http://sourceforge.net/projects/pmd/files/pmd/).
@@ -250,6 +253,7 @@ This behavior has been introduced to ease CPD integration into scripts or hooks,
 * python
 * ruby
 * scala
+* swift
 
 
 ### Available formats