diff --git a/packages/vaadin-checkbox/analysis.json b/packages/vaadin-checkbox/analysis.json
index 0fe8cb036a8..3b8cd4bc104 100644
--- a/packages/vaadin-checkbox/analysis.json
+++ b/packages/vaadin-checkbox/analysis.json
@@ -8,17 +8,17 @@
       "sourceRange": {
         "file": "vaadin-checkbox.html",
         "start": {
-          "line": 213,
+          "line": 214,
           "column": 6
         },
         "end": {
-          "line": 213,
+          "line": 214,
           "column": 42
         }
       },
       "elements": [
         {
-          "description": "`<vaadin-checkbox>` is a Polymer element for customized checkboxes.\n\n```html\n<vaadin-checkbox>\n  Make my profile visible\n</vaadin-checkbox>\n```\n\n### Styling\n\nThe following shadow DOM parts are exposed for styling:\n\nPart name         | Description\n------------------|----------------\n`wrapper`         | The `<label>` element which wrapps the checkbox and [part=\"label\"]\n`native-checkbox` | The `<input type=\"checkbox\">` element\n`checkbox`        | The `<span>` element for a custom graphical check\n`label`           | The `<span>` element for slotted text/HTML label\n\nThe following attributes are exposed for styling:\n\nAttribute    | Description\n-------------|------------\n`active`     | Set when the checkbox is pressed down, either with mouse, touch or the keyboard.\n`disabled`   | Set when the checkbox is disabled.\n`focus-ring` | Set when the checkbox is focused using the keyboard.\n`focused`    | Set when the checkbox is focused.",
+          "description": "`<vaadin-checkbox>` is a Polymer 2 element for customized checkboxes.\n\n```html\n<vaadin-checkbox>\n  Make my profile visible\n</vaadin-checkbox>\n```\n\n### Styling\n\nThe following shadow DOM parts are exposed for styling:\n\nPart name         | Description\n------------------|----------------\n`wrapper`         | The `<label>` element which wrapps the checkbox and [part=\"label\"]\n`native-checkbox` | The `<input type=\"checkbox\">` element\n`checkbox`        | The `<span>` element for a custom graphical check\n`label`           | The `<span>` element for slotted text/HTML label\n\nThe following attributes are exposed for styling:\n\nAttribute    | Description\n-------------|------------\n`active`     | Set when the checkbox is pressed down, either with mouse, touch or the keyboard.\n`disabled`   | Set when the checkbox is disabled.\n`focus-ring` | Set when the checkbox is focused using the keyboard.\n`focused`    | Set when the checkbox is focused.",
           "summary": "",
           "path": "vaadin-checkbox.html",
           "properties": [
@@ -98,11 +98,11 @@
               "privacy": "public",
               "sourceRange": {
                 "start": {
-                  "line": 117,
+                  "line": 118,
                   "column": 12
                 },
                 "end": {
-                  "line": 123,
+                  "line": 124,
                   "column": 13
                 }
               },
@@ -121,11 +121,11 @@
               "privacy": "public",
               "sourceRange": {
                 "start": {
-                  "line": 129,
+                  "line": 130,
                   "column": 12
                 },
                 "end": {
-                  "line": 134,
+                  "line": 135,
                   "column": 13
                 }
               },
@@ -143,11 +143,11 @@
               "privacy": "public",
               "sourceRange": {
                 "start": {
-                  "line": 139,
+                  "line": 140,
                   "column": 12
                 },
                 "end": {
-                  "line": 141,
+                  "line": 142,
                   "column": 13
                 }
               },
@@ -162,11 +162,11 @@
               "privacy": "public",
               "sourceRange": {
                 "start": {
-                  "line": 146,
+                  "line": 147,
                   "column": 12
                 },
                 "end": {
-                  "line": 149,
+                  "line": 150,
                   "column": 13
                 }
               },
@@ -183,11 +183,11 @@
               "privacy": "protected",
               "sourceRange": {
                 "start": {
-                  "line": 153,
+                  "line": 154,
                   "column": 8
                 },
                 "end": {
-                  "line": 159,
+                  "line": 160,
                   "column": 9
                 }
               },
@@ -385,17 +385,75 @@
               ],
               "inheritedFrom": "Vaadin.ControlStateMixin"
             },
+            {
+              "name": "_addEventListenerToNode",
+              "description": "",
+              "privacy": "protected",
+              "sourceRange": {
+                "file": "bower_components/polymer/lib/mixins/gesture-event-listeners.html",
+                "start": {
+                  "line": 41,
+                  "column": 6
+                },
+                "end": {
+                  "line": 45,
+                  "column": 7
+                }
+              },
+              "metadata": {},
+              "params": [
+                {
+                  "name": "node"
+                },
+                {
+                  "name": "eventName"
+                },
+                {
+                  "name": "handler"
+                }
+              ],
+              "inheritedFrom": "Polymer.GestureEventListeners"
+            },
+            {
+              "name": "_removeEventListenerFromNode",
+              "description": "",
+              "privacy": "protected",
+              "sourceRange": {
+                "file": "bower_components/polymer/lib/mixins/gesture-event-listeners.html",
+                "start": {
+                  "line": 47,
+                  "column": 6
+                },
+                "end": {
+                  "line": 51,
+                  "column": 7
+                }
+              },
+              "metadata": {},
+              "params": [
+                {
+                  "name": "node"
+                },
+                {
+                  "name": "eventName"
+                },
+                {
+                  "name": "handler"
+                }
+              ],
+              "inheritedFrom": "Polymer.GestureEventListeners"
+            },
             {
               "name": "_checkedChanged",
               "description": "",
               "privacy": "protected",
               "sourceRange": {
                 "start": {
-                  "line": 161,
+                  "line": 162,
                   "column": 8
                 },
                 "end": {
-                  "line": 163,
+                  "line": 164,
                   "column": 9
                 }
               },
@@ -412,11 +470,11 @@
               "privacy": "protected",
               "sourceRange": {
                 "start": {
-                  "line": 165,
+                  "line": 166,
                   "column": 8
                 },
                 "end": {
-                  "line": 171,
+                  "line": 172,
                   "column": 9
                 }
               },
@@ -433,11 +491,11 @@
               "privacy": "protected",
               "sourceRange": {
                 "start": {
-                  "line": 173,
+                  "line": 174,
                   "column": 8
                 },
                 "end": {
-                  "line": 201,
+                  "line": 202,
                   "column": 9
                 }
               },
@@ -479,11 +537,11 @@
           "metadata": {},
           "sourceRange": {
             "start": {
-              "line": 107,
+              "line": 108,
               "column": 6
             },
             "end": {
-              "line": 206,
+              "line": 207,
               "column": 7
             }
           },
@@ -550,11 +608,11 @@
               "description": "True if the checkbox is checked.",
               "sourceRange": {
                 "start": {
-                  "line": 117,
+                  "line": 118,
                   "column": 12
                 },
                 "end": {
-                  "line": 123,
+                  "line": 124,
                   "column": 13
                 }
               },
@@ -566,11 +624,11 @@
               "description": "Indeterminate state of the checkbox when it's neither checked nor unchecked, but undetermined.\nhttps://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/checkbox#Indeterminate_state_checkboxes",
               "sourceRange": {
                 "start": {
-                  "line": 129,
+                  "line": 130,
                   "column": 12
                 },
                 "end": {
-                  "line": 134,
+                  "line": 135,
                   "column": 13
                 }
               },
@@ -582,11 +640,11 @@
               "description": "The name of the control, which is submitted with the form data.",
               "sourceRange": {
                 "start": {
-                  "line": 139,
+                  "line": 140,
                   "column": 12
                 },
                 "end": {
-                  "line": 141,
+                  "line": 142,
                   "column": 13
                 }
               },
@@ -598,11 +656,11 @@
               "description": "The value given to the data submitted with the checkbox's name to the server when the control is inside a form.",
               "sourceRange": {
                 "start": {
-                  "line": 146,
+                  "line": 147,
                   "column": 12
                 },
                 "end": {
-                  "line": 149,
+                  "line": 150,
                   "column": 13
                 }
               },
@@ -648,7 +706,8 @@
           "tagname": "vaadin-checkbox",
           "mixins": [
             "Vaadin.ControlStateMixin",
-            "Vaadin.ThemableMixin"
+            "Vaadin.ThemableMixin",
+            "Polymer.GestureEventListeners"
           ]
         }
       ]
diff --git a/packages/vaadin-checkbox/vaadin-checkbox.html b/packages/vaadin-checkbox/vaadin-checkbox.html
index 2e1745031a1..89ef247dbd4 100644
--- a/packages/vaadin-checkbox/vaadin-checkbox.html
+++ b/packages/vaadin-checkbox/vaadin-checkbox.html
@@ -103,6 +103,7 @@
        * @memberof Vaadin
        * @mixes Vaadin.ControlStateMixin
        * @mixes Vaadin.ThemableMixin
+       * @mixes Polymer.GestureEventListeners
        * @demo demo/index.html
        */
       class CheckboxElement extends Vaadin.ControlStateMixin(Vaadin.ThemableMixin(Polymer.GestureEventListeners(Polymer.Element))) {