diff --git a/pmd-matlab/src/main/java/net/sourceforge/pmd/cpd/MatlabTokenizer.java b/pmd-matlab/src/main/java/net/sourceforge/pmd/cpd/MatlabTokenizer.java
index 83960cc009..e96726d2e1 100644
--- a/pmd-matlab/src/main/java/net/sourceforge/pmd/cpd/MatlabTokenizer.java
+++ b/pmd-matlab/src/main/java/net/sourceforge/pmd/cpd/MatlabTokenizer.java
@@ -16,8 +16,12 @@ import net.sourceforge.pmd.util.IOUtil;
 
 import org.apache.commons.io.IOUtils;
 
+/**
+ * The Matlab Tokenizer.
+ */
 public class MatlabTokenizer implements Tokenizer {
 
+    @Override
     public void tokenize(SourceCode sourceCode, Tokens tokenEntries) {
         StringBuilder buffer = sourceCode.getCodeBuffer();
         Reader reader = null;
diff --git a/src/site/markdown/overview/changelog.md b/src/site/markdown/overview/changelog.md
index a73418beab..f1265575ba 100644
--- a/src/site/markdown/overview/changelog.md
+++ b/src/site/markdown/overview/changelog.md
@@ -4,6 +4,7 @@
 
 **New Supported Languages:**
 
+* Matlab (CPD)
 * Python (CPD)
 
 **Feature Requests and Improvements:**
@@ -13,6 +14,7 @@
 **Pull Requests:**
 
 * [#11](https://github.com/adangel/pmd/pull/11): Added support for Python to CPD.
+* [#12](https://github.com/adangel/pmd/pull/12): Added support for Matlab to CPD.
 
 **Bugfixes:**