diff --git a/src/index.js b/src/index.js
index 52db650..8df3600 100644
--- a/src/index.js
+++ b/src/index.js
@@ -325,19 +325,20 @@ function renderToJS(source: string, config: RenderConfig): string {
           className = expr`
             ${className} + (${variant.expression}
                             ? ' ' + styles.${identifier(componentName + '__' + variantName)}
-                            : '')
+                            : '') + extraClassName
           `;
         } else {
           className = expr`
             ${className} + (variant.${identifier(variantName)}
                             ? ' ' + styles.${identifier(componentName + '__' + variantName)}
-                            : '')
+                            : '') + extraClassName
           `;
         }
       }
       statements.push(stmt`
         module.exports.${identifier(componentName)} = function ${identifier(componentName)}(props) {
           var variant = props.variant || {};
+          var extraClassName = props.className ? ' ' + props.className : '';
           var className = ${className};
           return React.createElement(
             ${component.base},