diff --git a/package-lock.json b/package-lock.json
index af7a10e..f699788 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,7 +16,7 @@
         "@polymer/iron-validatable-behavior": "^3.0.0-pre.26",
         "@polymer/paper-behaviors": "^3.0.0-pre.27",
         "@polymer/paper-input": "^3.1.0",
-        "@polymer/paper-menu-button": "^3.0.0-pre.26",
+        "@polymer/paper-menu-button": "^3.1.0",
         "@polymer/paper-ripple": "^3.0.0-pre.26",
         "@polymer/paper-styles": "^3.0.0-pre.26",
         "@polymer/polymer": "^3.3.1"
@@ -287,9 +287,9 @@
       }
     },
     "node_modules/@polymer/iron-fit-behavior": {
-      "version": "3.0.0-pre.26",
-      "resolved": "https://registry.npmjs.org/@polymer/iron-fit-behavior/-/iron-fit-behavior-3.0.0-pre.26.tgz",
-      "integrity": "sha512-GAeRVnyj1fUR6eFV+YpLOzmQIsIGkQ9FVLsD3T5yOhDuXnhBJ0RLhZ5sCW/f+9HLTheR0ZAbuehGOiw3HZr9Jw==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@polymer/iron-fit-behavior/-/iron-fit-behavior-3.1.0.tgz",
+      "integrity": "sha512-ABcgIYqrjhmUT8tiuolqeGttF/8pd3sEymUDrO1vXbZu4FWIvoLNndrMDFvs++AGd12Mjf5pYy84NJc6dB8Vig==",
       "dependencies": {
         "@polymer/polymer": "^3.0.0"
       }
@@ -495,16 +495,16 @@
       }
     },
     "node_modules/@polymer/paper-menu-button": {
-      "version": "3.0.0-pre.26",
-      "resolved": "https://registry.npmjs.org/@polymer/paper-menu-button/-/paper-menu-button-3.0.0-pre.26.tgz",
-      "integrity": "sha512-ZAbWT9/FBBp9pGU1xN2UGdeo/80yr/jntnvb/AIA04kKK0z5t09mol5ssMOqy9Zion4EHjjkGfXq29DZO6XWDA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@polymer/paper-menu-button/-/paper-menu-button-3.1.0.tgz",
+      "integrity": "sha512-q0G0/rvYD/FFmIBMGCQWjfXzRqwFw9+WHSYV4uOQzM1Ln8LMXSAd+2CENsbVwtMh6fmBePj15ZlU8SM2dt1WDQ==",
       "dependencies": {
-        "@polymer/iron-a11y-keys-behavior": "^3.0.0-pre.25",
-        "@polymer/iron-behaviors": "^3.0.0-pre.25",
-        "@polymer/iron-dropdown": "^3.0.0-pre.25",
-        "@polymer/iron-fit-behavior": "^3.0.0-pre.25",
-        "@polymer/neon-animation": "^3.0.0-pre.25",
-        "@polymer/paper-styles": "^3.0.0-pre.25",
+        "@polymer/iron-a11y-keys-behavior": "^3.0.0-pre.26",
+        "@polymer/iron-behaviors": "^3.0.0-pre.26",
+        "@polymer/iron-dropdown": "^3.0.0-pre.26",
+        "@polymer/iron-fit-behavior": "^3.1.0",
+        "@polymer/neon-animation": "^3.0.0-pre.26",
+        "@polymer/paper-styles": "^3.0.0-pre.26",
         "@polymer/polymer": "^3.0.0"
       }
     },
@@ -1405,8 +1405,7 @@
         "esprima": "^3.1.3",
         "estraverse": "^4.2.0",
         "esutils": "^2.0.2",
-        "optionator": "^0.8.1",
-        "source-map": "~0.6.1"
+        "optionator": "^0.8.1"
       },
       "bin": {
         "escodegen": "bin/escodegen.js",
@@ -2708,9 +2707,6 @@
       "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.15.0.tgz",
       "integrity": "sha512-Lf2JrFYx8FanHrjoV5oL8YHCclLQgbJcVZR+gikGGMqz6ub5QVWDTM6YIwm3BuPxM/LOV+rKns3LssXNLIf+DA==",
       "dev": true,
-      "dependencies": {
-        "clipboard": "^2.0.0"
-      },
       "optionalDependencies": {
         "clipboard": "^2.0.0"
       }
@@ -3797,9 +3793,9 @@
       }
     },
     "@polymer/iron-fit-behavior": {
-      "version": "3.0.0-pre.26",
-      "resolved": "https://registry.npmjs.org/@polymer/iron-fit-behavior/-/iron-fit-behavior-3.0.0-pre.26.tgz",
-      "integrity": "sha512-GAeRVnyj1fUR6eFV+YpLOzmQIsIGkQ9FVLsD3T5yOhDuXnhBJ0RLhZ5sCW/f+9HLTheR0ZAbuehGOiw3HZr9Jw==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@polymer/iron-fit-behavior/-/iron-fit-behavior-3.1.0.tgz",
+      "integrity": "sha512-ABcgIYqrjhmUT8tiuolqeGttF/8pd3sEymUDrO1vXbZu4FWIvoLNndrMDFvs++AGd12Mjf5pYy84NJc6dB8Vig==",
       "requires": {
         "@polymer/polymer": "^3.0.0"
       }
@@ -4005,16 +4001,16 @@
       }
     },
     "@polymer/paper-menu-button": {
-      "version": "3.0.0-pre.26",
-      "resolved": "https://registry.npmjs.org/@polymer/paper-menu-button/-/paper-menu-button-3.0.0-pre.26.tgz",
-      "integrity": "sha512-ZAbWT9/FBBp9pGU1xN2UGdeo/80yr/jntnvb/AIA04kKK0z5t09mol5ssMOqy9Zion4EHjjkGfXq29DZO6XWDA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@polymer/paper-menu-button/-/paper-menu-button-3.1.0.tgz",
+      "integrity": "sha512-q0G0/rvYD/FFmIBMGCQWjfXzRqwFw9+WHSYV4uOQzM1Ln8LMXSAd+2CENsbVwtMh6fmBePj15ZlU8SM2dt1WDQ==",
       "requires": {
-        "@polymer/iron-a11y-keys-behavior": "^3.0.0-pre.25",
-        "@polymer/iron-behaviors": "^3.0.0-pre.25",
-        "@polymer/iron-dropdown": "^3.0.0-pre.25",
-        "@polymer/iron-fit-behavior": "^3.0.0-pre.25",
-        "@polymer/neon-animation": "^3.0.0-pre.25",
-        "@polymer/paper-styles": "^3.0.0-pre.25",
+        "@polymer/iron-a11y-keys-behavior": "^3.0.0-pre.26",
+        "@polymer/iron-behaviors": "^3.0.0-pre.26",
+        "@polymer/iron-dropdown": "^3.0.0-pre.26",
+        "@polymer/iron-fit-behavior": "^3.1.0",
+        "@polymer/neon-animation": "^3.0.0-pre.26",
+        "@polymer/paper-styles": "^3.0.0-pre.26",
         "@polymer/polymer": "^3.0.0"
       }
     },
diff --git a/package.json b/package.json
index 20a0db6..63bce0a 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "@polymer/iron-validatable-behavior": "^3.0.0-pre.26",
     "@polymer/paper-behaviors": "^3.0.0-pre.27",
     "@polymer/paper-input": "^3.1.0",
-    "@polymer/paper-menu-button": "^3.0.0-pre.26",
+    "@polymer/paper-menu-button": "^3.1.0",
     "@polymer/paper-ripple": "^3.0.0-pre.26",
     "@polymer/paper-styles": "^3.0.0-pre.26",
     "@polymer/polymer": "^3.3.1"
diff --git a/paper-dropdown-menu.js b/paper-dropdown-menu.js
index 62df76d..8cbd429 100644
--- a/paper-dropdown-menu.js
+++ b/paper-dropdown-menu.js
@@ -95,7 +95,7 @@ Polymer({
   _template: html`
     <style include="paper-dropdown-menu-shared-styles"></style>
 
-    <paper-menu-button id="menuButton" vertical-align="[[verticalAlign]]" horizontal-align="[[horizontalAlign]]" dynamic-align="[[dynamicAlign]]" vertical-offset="[[_computeMenuVerticalOffset(noLabelFloat, verticalOffset)]]" disabled="[[disabled]]" no-animations="[[noAnimations]]" on-iron-select="_onIronSelect" on-iron-deselect="_onIronDeselect" opened="{{opened}}" close-on-activate allow-outside-scroll="[[allowOutsideScroll]]" restore-focus-on-close="[[restoreFocusOnClose]]">
+    <paper-menu-button id="menuButton" vertical-align="[[verticalAlign]]" horizontal-align="[[horizontalAlign]]" dynamic-align="[[dynamicAlign]]" vertical-offset="[[_computeMenuVerticalOffset(noLabelFloat, verticalOffset)]]" disabled="[[disabled]]" no-animations="[[noAnimations]]" on-iron-select="_onIronSelect" on-iron-deselect="_onIronDeselect" opened="{{opened}}" close-on-activate allow-outside-scroll="[[allowOutsideScroll]]" restore-focus-on-close="[[restoreFocusOnClose]]" expand-sizing-target-for-scrollbars="[[expandSizingTargetForScrollbars]]">
       <!-- support hybrid mode: user might be using paper-menu-button 1.x which distributes via <content> -->
       <div class="dropdown-trigger" slot="dropdown-trigger">
         <paper-ripple></paper-ripple>
@@ -222,6 +222,13 @@ Polymer({
      * Whether focus should be restored to the dropdown when the menu closes.
      */
     restoreFocusOnClose: {type: Boolean, value: true},
+
+    /**
+     * If true and scrollbars are added to the dropdown after it is positioned,
+     * the size of the added scrollbars will be added to its `maxWidth` and
+     * `maxHeight`.
+     */
+    expandSizingTargetForScrollbars: {type: Boolean, value: false},
   },
 
   listeners: {'tap': '_onTap'},