diff --git a/.eslintrc.yml b/.eslintrc.yml
index 7b4a3787..026e063f 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -6,7 +6,13 @@ env:
   mocha: true
 plugins:
   - lodash
+  - jsdoc
 extends: 'eslint:recommended'
+settings:
+  jsdoc:
+    additionalTagNames:
+      customTags:
+        - fulfil
 rules:
 
   # Possible Errors
@@ -645,3 +651,24 @@ rules:
     - error
   lodash/prefer-times:
     - error
+
+  # JSDoc
+
+  jsdoc/check-param-names:
+    - error
+  jsdoc/check-tag-names:
+    - error
+  jsdoc/newline-after-description:
+    - error
+  jsdoc/require-example:
+    - error
+  jsdoc/require-hyphen-before-param-description:
+    - error
+  jsdoc/require-param:
+    - error
+  jsdoc/require-param-description:
+    - error
+  jsdoc/require-param-type:
+    - error
+  jsdoc/require-returns-type:
+    - error
diff --git a/lib/gui/components/safe-webview.js b/lib/gui/components/safe-webview.js
index c6c95d8b..569e7adf 100644
--- a/lib/gui/components/safe-webview.js
+++ b/lib/gui/components/safe-webview.js
@@ -16,6 +16,8 @@
 
 'use strict';
 
+/* eslint-disable jsdoc/require-example */
+
 const _ = require('lodash');
 const electron = require('electron');
 const angular = require('angular');
diff --git a/lib/gui/components/svg-icon.js b/lib/gui/components/svg-icon.js
index 24f33b0f..2df911e8 100644
--- a/lib/gui/components/svg-icon.js
+++ b/lib/gui/components/svg-icon.js
@@ -16,6 +16,8 @@
 
 'use strict';
 
+/* eslint-disable jsdoc/require-example */
+
 /**
  * @module Etcher.Components.SVGIcon
  */
diff --git a/lib/gui/pages/settings/controllers/settings.js b/lib/gui/pages/settings/controllers/settings.js
index 9e9b7725..dd019d11 100644
--- a/lib/gui/pages/settings/controllers/settings.js
+++ b/lib/gui/pages/settings/controllers/settings.js
@@ -36,6 +36,9 @@ module.exports = function(WarningModalService) {
    * @summary Refresh current settings
    * @function
    * @public
+   *
+   * @example
+   * SettingsController.refreshSettings();
    */
   this.refreshSettings = () => {
     this.currentData = settings.getAll();
diff --git a/lib/image-stream/archive.js b/lib/image-stream/archive.js
index b8e6dfde..07bad766 100644
--- a/lib/image-stream/archive.js
+++ b/lib/image-stream/archive.js
@@ -60,6 +60,7 @@ const IMAGE_EXTENSIONS = _.reduce(supportedFileTypes, (accumulator, file) => {
  * @fulfil {*} contents
  * @returns {Promise}
  *
+ * @example
  * extractEntryByPath('my/archive.zip', '_info/logo.svg', {
  *   hooks: { ... },
  *   entries: [ ... ],
@@ -98,6 +99,7 @@ const extractEntryByPath = (archive, filePath, options) => {
  * @fulfil {Object} - metadata
  * @returns {Promise}
  *
+ * @example
  * extractArchiveMetadata('my/archive.zip', '.meta', {
  *   hooks: { ... },
  *   entries: [ ... ]
diff --git a/lib/image-stream/handlers.js b/lib/image-stream/handlers.js
index 77d91d26..7d2ebd88 100644
--- a/lib/image-stream/handlers.js
+++ b/lib/image-stream/handlers.js
@@ -16,6 +16,8 @@
 
 'use strict';
 
+/* eslint-disable jsdoc/require-example */
+
 const Bluebird = require('bluebird');
 const fs = Bluebird.promisifyAll(require('fs'));
 const PassThroughStream = require('stream').PassThrough;
diff --git a/lib/image-stream/parse-partitions.js b/lib/image-stream/parse-partitions.js
index dd4c92a1..98c8a072 100644
--- a/lib/image-stream/parse-partitions.js
+++ b/lib/image-stream/parse-partitions.js
@@ -152,7 +152,6 @@ const parsePartitionTables = (image, buffer) => {
  * @param {Object} image - image metadata
  * @returns {Promise}
  * @fulfil {Object} image
- * @reject {Error}
  *
  * @example
  * parsePartitions(image)
diff --git a/lib/shared/supported-formats.js b/lib/shared/supported-formats.js
index 3da8a641..5ef22979 100644
--- a/lib/shared/supported-formats.js
+++ b/lib/shared/supported-formats.js
@@ -47,6 +47,7 @@ const getExtensionsFromTypeGetter = (type) => {
  *
  * @returns {String[]} compressed extensions
  *
+ * @example
  * _.each(supportedFormats.getCompressedExtensions(), (extension) => {
  *   console.log('We support the ' + extension + ' compressed file format');
  * });
@@ -60,6 +61,7 @@ exports.getCompressedExtensions = getExtensionsFromTypeGetter('compressed');
  *
  * @returns {String[]} no compressed extensions
  *
+ * @example
  * _.each(supportedFormats.getNonCompressedExtensions(), (extension) => {
  *   console.log('We support the ' + extension + ' file format');
  * });
@@ -73,6 +75,7 @@ exports.getNonCompressedExtensions = getExtensionsFromTypeGetter('image');
  *
  * @returns {String[]} archive extensions
  *
+ * @example
  * _.each(supportedFormats.getArchiveExtensions(), (extension) => {
  *   console.log('We support the ' + extension + ' file format');
  * });
@@ -86,6 +89,7 @@ exports.getArchiveExtensions = getExtensionsFromTypeGetter('archive');
  *
  * @returns {String[]} extensions
  *
+ * @example
  * _.each(supportedFormats.getAllExtensions(), (extension) => {
  *   console.log('We support the ' + extension + ' format');
  * });
@@ -102,6 +106,7 @@ exports.getAllExtensions = () => {
  * @param {String} imagePath - image path
  * @returns {Boolean} whether the image is supported
  *
+ * @example
  * if (supportedFormats.isSupportedImage('foo.iso.bz2')) {
  *   console.log('The image is supported!');
  * }
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 1e515104..6ce0974e 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -863,6 +863,12 @@
       "from": "commander@>=2.8.1 <2.9.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz"
     },
+    "comment-parser": {
+      "version": "0.4.0",
+      "from": "comment-parser@>=0.4.0 <0.5.0",
+      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-0.4.0.tgz",
+      "dev": true
+    },
     "commoner": {
       "version": "0.10.8",
       "from": "commoner@>=0.10.3 <0.11.0",
@@ -1910,6 +1916,12 @@
         }
       }
     },
+    "eslint-plugin-jsdoc": {
+      "version": "3.1.1",
+      "from": "eslint-plugin-jsdoc@latest",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-3.1.1.tgz",
+      "dev": true
+    },
     "eslint-plugin-lodash": {
       "version": "2.3.6",
       "from": "eslint-plugin-lodash@2.3.6",
diff --git a/package.json b/package.json
index 35e03dcc..600281ef 100644
--- a/package.json
+++ b/package.json
@@ -87,6 +87,7 @@
     "electron-builder": "19.9.1",
     "electron-mocha": "3.3.0",
     "eslint": "3.18.0",
+    "eslint-plugin-jsdoc": "^3.1.1",
     "eslint-plugin-lodash": "2.3.6",
     "file-exists": "1.0.0",
     "html-angular-validate": "0.1.9",