diff --git a/addons/viewport/README.md b/addons/viewport/README.md
index a7817f11070..78dcae25c40 100644
--- a/addons/viewport/README.md
+++ b/addons/viewport/README.md
@@ -188,6 +188,19 @@ storiesOf('Decorator with string', module)
     </h1>
   ));
 
+// Single
+storiesOf('Parameterized story', module)
+  .addDecorator(withViewport())
+  .add(
+    'iPad',
+    () => (
+      <h1>
+        Do I look good on <b>iPad</b>?
+      </h1>
+    ),
+    { viewport: 'ipad' }
+  );
+
 storiesOf('Decorator with object', module)
   .addDecorator(
     withViewport({
diff --git a/addons/viewport/src/preview/withViewport.js b/addons/viewport/src/preview/withViewport.js
index 1527080ee02..44a74228c27 100644
--- a/addons/viewport/src/preview/withViewport.js
+++ b/addons/viewport/src/preview/withViewport.js
@@ -1,4 +1,4 @@
-import addons from '@storybook/addons';
+import addons, { makeDecorator } from '@storybook/addons';
 import CoreEvents from '@storybook/core-events';
 import deprecate from 'util-deprecate';
 
@@ -11,36 +11,44 @@ import {
 function noop() {}
 let handler = noop;
 
+const callHandler = (...args) => handler(...args)
+
 const subscription = () => {
   const channel = addons.getChannel();
-  channel.on(VIEWPORT_CHANGED_EVENT_ID, handler);
-  return () => channel.removeListener(VIEWPORT_CHANGED_EVENT_ID, handler);
+  channel.on(VIEWPORT_CHANGED_EVENT_ID, callHandler);
+  return () => channel.removeListener(VIEWPORT_CHANGED_EVENT_ID, callHandler);
 };
 
-const setViewport = options => {
+const applyViewportOptions = (options = {}) => {
   const channel = addons.getChannel();
+
   handler = options.onViewportChange || noop;
   if (options.onViewportChange) {
     channel.emit(CoreEvents.REGISTER_SUBSCRIPTION, subscription);
   }
+
   channel.emit(SET_STORY_DEFAULT_VIEWPORT_EVENT_ID, options.name || DEFAULT_VIEWPORT);
 };
 
-export default function withViewport(nameOrOptions) {
-  const options = typeof nameOrOptions === 'string' ? { name: nameOrOptions } : nameOrOptions;
+const withViewport = makeDecorator({
+  name: 'withViewport',
+  parameterName: 'viewport',
+  wrapper: (getStory, context, { options, parameters }) => {
+    const storyOptions = parameters || options;
+    const viewportOptions =
+      typeof storyOptions === 'string' ? { name: storyOptions } : storyOptions;
+
+    if (viewportOptions) {
+      applyViewportOptions(viewportOptions);
+    }
 
-  return (story, context) => {
-    const decorated = () => {
-      setViewport(options);
-      return story();
-    };
+    return getStory(context);
+  },
+});
 
-    // Absent context means a direct call, withViewport(viewport)(storyFn)
-    return context ? decorated() : decorated;
-  };
-}
+export default withViewport;
 
 export const Viewport = deprecate(({ children, ...options }) => {
-  setViewport(options);
+  applyViewportOptions(options);
   return children;
-}, `<Viewport> usage is deprecated, use .addDecorator(withViewport(viewport)) instead`);
+}, `<Viewport> usage is deprecated, use .addParameters({ viewport }) instead`);
diff --git a/examples/official-storybook/stories/Logger.js b/examples/official-storybook/stories/Logger.js
index 80f2f03fbbf..4b6571c9ebc 100644
--- a/examples/official-storybook/stories/Logger.js
+++ b/examples/official-storybook/stories/Logger.js
@@ -12,7 +12,7 @@ const Wrapper = styled('div')({
 const Title = styled('h1')({
   margin: 0,
 });
-const Item = () => ({
+const Item = styled('div')({
   listStyle: 'none',
   marginBottom: 10,
 });
diff --git a/examples/official-storybook/stories/__snapshots__/addon-viewport.stories.storyshot b/examples/official-storybook/stories/__snapshots__/addon-viewport.stories.storyshot
index 67479d9354a..17da990704e 100644
--- a/examples/official-storybook/stories/__snapshots__/addon-viewport.stories.storyshot
+++ b/examples/official-storybook/stories/__snapshots__/addon-viewport.stories.storyshot
@@ -32,7 +32,7 @@ exports[`Storyshots Addons|Viewport.Custom Default (Kindle Fire 2) Overridden vi
 </div>
 `;
 
-exports[`Storyshots Addons|Viewport.Custom Default (Kindle Fire 2) Overridden via "withViewport" decorator 1`] = `
+exports[`Storyshots Addons|Viewport.Custom Default (Kindle Fire 2) Overridden via "withViewport" decorator (deprecated) 1`] = `
 <div
   class="css-9por5e"
 >
@@ -44,6 +44,18 @@ exports[`Storyshots Addons|Viewport.Custom Default (Kindle Fire 2) Overridden vi
 </div>
 `;
 
+exports[`Storyshots Addons|Viewport.Custom Default (Kindle Fire 2) Overridden via "withViewport" parameterized decorator 1`] = `
+<div
+  class="css-9por5e"
+>
+  I respect my parents but I should be looking good on 
+  <b>
+    iPad
+  </b>
+  .
+</div>
+`;
+
 exports[`Storyshots Addons|Viewport.withViewport onViewportChange 1`] = `
 <div
   class="css-1ruxp1v"
diff --git a/examples/official-storybook/stories/addon-viewport.stories.js b/examples/official-storybook/stories/addon-viewport.stories.js
index f2ecd4f9806..e8e1cc76670 100644
--- a/examples/official-storybook/stories/addon-viewport.stories.js
+++ b/examples/official-storybook/stories/addon-viewport.stories.js
@@ -23,7 +23,16 @@ storiesOf('Addons|Viewport.Custom Default (Kindle Fire 2)', module)
     </Panel>
   ))
   .add(
-    'Overridden via "withViewport" decorator',
+    'Overridden via "withViewport" parameterized decorator',
+    () => (
+      <Panel>
+        I respect my parents but I should be looking good on <b>iPad</b>.
+      </Panel>
+    ),
+    { viewport: 'ipad' }
+  )
+  .add(
+    'Overridden via "withViewport" decorator (deprecated)',
     withViewport('iphone6')(() => (
       <Panel>
         I respect my parents but I should be looking good on <b>iPhone 6</b>.