diff --git a/react-bootstrap/react-bootstrap-tests.tsx b/react-bootstrap/react-bootstrap-tests.tsx
index 439fe1b96b..2712853f28 100644
--- a/react-bootstrap/react-bootstrap-tests.tsx
+++ b/react-bootstrap/react-bootstrap-tests.tsx
@@ -7,7 +7,7 @@
 // --------------------------------------------------------------------------------
 import * as React from 'react';
 import { Component, CSSProperties } from 'react';
-import { Button, ButtonToolbar, Modal, Well, ButtonGroup, DropdownButton, MenuItem, Panel, ListGroup, ListGroupItem, Accordion, Tooltip, OverlayTrigger, Popover, ProgressBar, Nav, NavItem, Navbar, NavDropdown, Tabs, Tab, Pager, PageItem, Pagination, Alert, Carousel, CarouselItem, Grid, Row, Col, Thumbnail, Image, Label, Badge, Jumbotron, PageHeader, Glyphicon, Table, Input, ButtonInput, Form, FormGroup, ControlLabel, FormControl, HelpBlock, Radio, Checkbox } from 'react-bootstrap';
+import { Button, ButtonToolbar, Modal, Well, ButtonGroup, DropdownButton, MenuItem, Panel, ListGroup, ListGroupItem, Accordion, Tooltip, OverlayTrigger, Popover, ProgressBar, Nav, NavItem, Navbar, NavDropdown, Tabs, Tab, Pager, PageItem, Pagination, Alert, Carousel, CarouselItem, Grid, Row, Col, Thumbnail, Image, Label, Badge, Jumbotron, PageHeader, Glyphicon, Table, Input, ButtonInput, Form, FormGroup, ControlLabel, FormControl, HelpBlock, Radio, Checkbox, Media } from 'react-bootstrap';
 
 
 export class ReactBootstrapTest extends Component<any, any> {
@@ -965,6 +965,19 @@ export class ReactBootstrapTest extends Component<any, any> {
                     </FormGroup>
                   </Form>
                 </div>
+
+               <div style={style}>
+                <Media>
+                  <Media.Left align="top">
+                    <img width={64} height={64} src="https://placeholdit.imgix.net/~text?txtsize=33&txt=AUDIO&w=150&h=150" alt="Image"/>
+                  </Media.Left>
+                  <Media.Body>
+                    <Media.Heading>Top aligned media</Media.Heading>
+                    <p>Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.</p>
+                    <p>Donec sed odio dui. Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
+                  </Media.Body>
+                </Media>
+              </div>
             </div>
         );
     }
diff --git a/react-bootstrap/react-bootstrap.d.ts b/react-bootstrap/react-bootstrap.d.ts
index 8d75e82f93..a4e70260f3 100644
--- a/react-bootstrap/react-bootstrap.d.ts
+++ b/react-bootstrap/react-bootstrap.d.ts
@@ -1058,7 +1058,6 @@ declare module "react-bootstrap" {
     type Portal = React.ClassicComponent<PortalProps, {}>;
     var Portal: React.ClassicComponentClass<PortalProps>;
 
-
     // <Position />
     interface PositionProps extends TransitionCallbacks, React.Props<Position> {
         dimension?: string | Function;
@@ -1071,5 +1070,59 @@ declare module "react-bootstrap" {
     }
     class Position extends React.Component<PositionProps, {}> {
     }
+    // <Media.Left />
+    interface MediaLeftProps {
+        align?: string;
+    }
+    type MediaLeft = React.ClassicComponent<MediaLeftProps, {}>;
+    var MediaLeft: React.ClassicComponentClass<MediaLeftProps>;
 
+    // <Media.Right />
+    interface MediaRightProps {
+        align?: string;
+    }
+    type MediaRight = React.ClassicComponent<MediaRightProps, {}>;
+    var MediaRight: React.ClassicComponentClass<MediaRightProps>;
+
+    // <Media.Heading />
+    interface MediaHeadingProps {
+        componentClass?: React.ReactType;
+    }
+    type MediaHeading = React.ClassicComponent<MediaHeadingProps, {}>;
+    var MediaHeading: React.ClassicComponentClass<MediaHeadingProps>;
+
+    // <Media.Body />
+    interface MediaBodyProps {
+        componentClass?: React.ReactType;
+    }
+    type MediaBody = React.ClassicComponent<MediaBodyProps, {}>;
+    var MediaBody: React.ClassicComponentClass<MediaBodyProps>;
+
+    // <Media.List />
+    interface MediaListProps {
+    }
+    type MediaList = React.ClassicComponent<MediaListProps, {}>;
+    var MediaList: React.ClassicComponentClass<MediaListProps>;
+
+    // <Media.ListItem />
+    interface MediaListItemProps {
+        componentClass?: React.ReactType;
+    }
+    type MediaListItem = React.ClassicComponent<MediaListItemProps, {}>;
+    var MediaListItem: React.ClassicComponentClass<MediaListItemProps>;
+
+    // <Media />
+    interface MediaProps extends React.HTMLProps<Media> {
+        componentClass?: React.ReactType;
+    }
+    interface MediaClass extends React.ClassicComponentClass<MediaProps> {
+        Left: typeof MediaLeft;
+        Right: typeof MediaRight;
+        Heading: typeof MediaHeading;
+        Body: typeof MediaBody;
+        List: typeof MediaList;
+        ListItem: typeof MediaListItem;
+    }
+    type Media = React.ClassicComponent<MediaProps, {}>;
+    var Media: MediaClass;
 }