diff --git a/src/components/Flag.js b/src/components/Flag.js
index f63c7aa87..5564a940b 100644
--- a/src/components/Flag.js
+++ b/src/components/Flag.js
@@ -1,13 +1,35 @@
 import React, { PropTypes } from 'react';
-import { Tag } from 'reactstrap';
 
-const Flag = (props) => <Tag {...props} />;
+// TODO can remove this component once reactstrap moves Tag to Badge component.
+const Flag = (props) => {
+  const {
+    className,
+    color,
+    pill,
+    tag: Component,
+    ...attributes
+  } = props;
 
-const propTypes = {
+  const classes = `${className} badge badge-${color} ${pill ? 'badge-pill' : false}`;
+
+  return (
+    <Component {...attributes} className={classes} />
+  );
+};
+
+Flag.propTypes = {
   color: PropTypes.string,
+  pill: PropTypes.bool,
+  tag: PropTypes.oneOfType([PropTypes.func, PropTypes.string]),
+  children: PropTypes.node,
+  className: PropTypes.string,
   cssModule: PropTypes.object,
 };
 
-Flag.propTypes = propTypes;
+Flag.defaultProps = {
+  color: 'default',
+  pill: false,
+  tag: 'span'
+};
 
 export default Flag;
diff --git a/src/index.js b/src/index.js
index eb5244781..072f2c1d3 100755
--- a/src/index.js
+++ b/src/index.js
@@ -59,7 +59,6 @@ import {
   TabContent,
   TabPane,
   Table,
-  Tag,
   TetherContent,
   Tooltip
 } from 'reactstrap';
@@ -144,7 +143,6 @@ export {
   TabContent,
   TabPane,
   Table,
-  Tag,
   TetherContent,
   Tooltip,