diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e911b2..fb623f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+5.0.2 / WIP
+------------------
+
+- Fix meta information (`token.markup` and `token.info`) for autolink tokens.
+
+
 5.0.1 / 2015-10-30
 ------------------
 
diff --git a/lib/rules_inline/autolink.js b/lib/rules_inline/autolink.js
index 43bf9e6..726c9ea 100644
--- a/lib/rules_inline/autolink.js
+++ b/lib/rules_inline/autolink.js
@@ -32,11 +32,15 @@ module.exports = function autolink(state, silent) {
     if (!silent) {
       token         = state.push('link_open', 'a', 1);
       token.attrs   = [ [ 'href', fullUrl ] ];
+      token.markup  = 'autolink';
+      token.info    = 'auto';
 
       token         = state.push('text', '', 0);
       token.content = state.md.normalizeLinkText(url);
 
       token         = state.push('link_close', 'a', -1);
+      token.markup  = 'autolink';
+      token.info    = 'auto';
     }
 
     state.pos += linkMatch[0].length;