diff --git a/.eslintrc.json b/.eslintrc.json
index 7fdd614117..731393c818 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -5,7 +5,7 @@
   ],
   "parserOptions": { "ecmaVersion": 5 },
   "rules": {
-    "semi": "off",
+    "semi": ["error", "always"],
     "indent": ["warn", 2, {
       "VariableDeclarator": { "var": 2 },
       "SwitchCase": 1,
diff --git a/docs/demo/demo.js b/docs/demo/demo.js
index f12724596a..af77a81242 100644
--- a/docs/demo/demo.js
+++ b/docs/demo/demo.js
@@ -25,7 +25,7 @@ $previewIframe.addEventListener('load', function () {
   iframeLoaded = true;
   inputDirty = true;
   checkForChanges();
-})
+});
 
 if ('text' in search) {
   $inputElem.value = search.text;
diff --git a/lib/marked.js b/lib/marked.js
index b9c838de06..51c7c2ac06 100644
--- a/lib/marked.js
+++ b/lib/marked.js
@@ -744,7 +744,7 @@ InlineLexer.prototype.output = function(src) {
         ? this.options.sanitizer
           ? this.options.sanitizer(cap[0])
           : escape(cap[0])
-        : cap[0]
+        : cap[0];
       continue;
     }
 
@@ -847,7 +847,7 @@ InlineLexer.prototype.output = function(src) {
 
 InlineLexer.escapes = function(text) {
   return text ? text.replace(InlineLexer.rules._escapes, '$1') : text;
-}
+};
 
 /**
  * Compile Link
@@ -983,7 +983,7 @@ Renderer.prototype.checkbox = function(checked) {
     + 'disabled="" type="checkbox"'
     + (this.options.xhtml ? ' /' : '')
     + '> ';
-}
+};
 
 Renderer.prototype.paragraph = function(text) {
   return '<p>' + text + '</p>\n';
@@ -1093,16 +1093,16 @@ TextRenderer.prototype.codespan =
 TextRenderer.prototype.del =
 TextRenderer.prototype.text = function (text) {
   return text;
-}
+};
 
 TextRenderer.prototype.link =
 TextRenderer.prototype.image = function(href, title, text) {
   return '' + text;
-}
+};
 
 TextRenderer.prototype.br = function() {
   return '';
-}
+};
 
 /**
  * Parsing & Compiling
@@ -1289,11 +1289,11 @@ Parser.prototype.tok = function() {
 function escape(html, encode) {
   if (encode) {
     if (escape.escapeTest.test(html)) {
-      return html.replace(escape.escapeReplace, function (ch) { return escape.replacements[ch] });
+      return html.replace(escape.escapeReplace, function (ch) { return escape.replacements[ch]; });
     }
   } else {
     if (escape.escapeTestNoEncode.test(html)) {
-      return html.replace(escape.escapeReplaceNoEncode, function (ch) { return escape.replacements[ch] });
+      return html.replace(escape.escapeReplaceNoEncode, function (ch) { return escape.replacements[ch]; });
     }
   }
 
@@ -1473,7 +1473,7 @@ function marked(src, opt, callback) {
         i = 0;
 
     try {
-      tokens = Lexer.lex(src, opt)
+      tokens = Lexer.lex(src, opt);
     } catch (e) {
       return callback(e);
     }
@@ -1572,7 +1572,7 @@ marked.getDefaults = function () {
     tables: true,
     xhtml: false
   };
-}
+};
 
 marked.defaults = marked.getDefaults();
 
diff --git a/test/specs/commonmark/commonmark-spec.js b/test/specs/commonmark/commonmark-spec.js
index f03e7abbf1..8513cc939f 100644
--- a/test/specs/commonmark/commonmark-spec.js
+++ b/test/specs/commonmark/commonmark-spec.js
@@ -4,11 +4,11 @@ var HtmlDiffer = require('@markedjs/html-differ').HtmlDiffer,
     htmlDiffer = new HtmlDiffer({ignoreSelfClosingSlash: true});
 var since = require('jasmine2-custom-message');
 
-var Messenger = function() {}
+var Messenger = function() {};
 
 Messenger.prototype.message = function(spec, expected, actual) {
   return 'CommonMark (' + spec.section + '):\n' + spec.markdown + '\n------\n\nExpected:\n' + expected + '\n------\n\nMarked:\n' + actual;
-}
+};
 
 Messenger.prototype.test = function(spec, section, ignore) {
   if (spec.section === section) {
@@ -21,7 +21,7 @@ Messenger.prototype.test = function(spec, section, ignore) {
       ).toEqual(!shouldFail);
     });
   }
-}
+};
 
 var messenger = new Messenger();
 /*
diff --git a/test/specs/gfm/gfm-spec.js b/test/specs/gfm/gfm-spec.js
index 65b5623e9e..83340db0fa 100644
--- a/test/specs/gfm/gfm-spec.js
+++ b/test/specs/gfm/gfm-spec.js
@@ -1,14 +1,14 @@
 var marked = require('../../../lib/marked.js');
-var gfmSpec = require('./gfm.0.28.json')
+var gfmSpec = require('./gfm.0.28.json');
 var HtmlDiffer = require('@markedjs/html-differ').HtmlDiffer,
     htmlDiffer = new HtmlDiffer({ignoreSelfClosingSlash: true});
 var since = require('jasmine2-custom-message');
 
-var Messenger = function() {}
+var Messenger = function() {};
 
 Messenger.prototype.message = function(spec, expected, actual) {
   return 'CommonMark (' + spec.section + '):\n' + spec.markdown + '\n------\n\nExpected:\n' + expected + '\n------\n\nMarked:\n' + actual;
-}
+};
 
 Messenger.prototype.test = function(spec, section, ignore) {
   if (spec.section === section && ignore.indexOf(spec.example) < 0) {
@@ -21,7 +21,7 @@ Messenger.prototype.test = function(spec, section, ignore) {
       ).toEqual(!shouldFail);
     });
   }
-}
+};
 
 var messenger = new Messenger();
 
diff --git a/test/specs/marked/marked-spec.js b/test/specs/marked/marked-spec.js
index ce8ef6d0d7..acc4495c7f 100644
--- a/test/specs/marked/marked-spec.js
+++ b/test/specs/marked/marked-spec.js
@@ -11,11 +11,11 @@ var HtmlDiffer = require('@markedjs/html-differ').HtmlDiffer,
     htmlDiffer = new HtmlDiffer({ignoreSelfClosingSlash: true});
 var since = require('jasmine2-custom-message');
 
-var Messenger = function() {}
+var Messenger = function() {};
 
 Messenger.prototype.message = function(spec, expected, actual) {
   return 'CommonMark (' + spec.section + '):\n' + spec.markdown + '\n------\n\nExpected:\n' + expected + '\n------\n\nMarked:\n' + actual;
-}
+};
 
 Messenger.prototype.test = function(spec, section, ignore) {
   if (spec.section === section) {
@@ -28,7 +28,7 @@ Messenger.prototype.test = function(spec, section, ignore) {
       ).toEqual(!shouldFail);
     });
   }
-}
+};
 
 var messenger = new Messenger();