diff --git a/react-bootstrap/react-bootstrap-tests.tsx b/react-bootstrap/react-bootstrap-tests.tsx
index 8b0dd0fc0..2d578a13e 100644
--- a/react-bootstrap/react-bootstrap-tests.tsx
+++ b/react-bootstrap/react-bootstrap-tests.tsx
@@ -453,17 +453,25 @@ export class ReactBootstrapTest extends Component<any, any> {
 
                 <div style={style}>
                   <Navbar brand='React-Bootstrap'>
-                    <Nav>
-                      <NavItem eventKey={1} href='#'>Link</NavItem>
-                      <NavItem eventKey={2} href='#'>Link</NavItem>
-                      <NavDropdown eventKey={3} title='Dropdown' id='basic-nav-dropdown'>
-                        <MenuItem eventKey='1'>Action</MenuItem>
-                        <MenuItem eventKey='2'>Another action</MenuItem>
-                        <MenuItem eventKey='3'>Something else here</MenuItem>
-                        <MenuItem divider />
-                        <MenuItem eventKey='4'>Separated link</MenuItem>
-                      </NavDropdown>
-                    </Nav>
+                    <Navbar.Header>
+                      <Navbar.Brand>
+                        <a href="#">React-Bootstrap</a>
+                      </Navbar.Brand>
+                      <Navbar.Toggle />
+                    </Navbar.Header>
+                    <Navbar.Collapse>
+                      <Nav>
+                        <NavItem eventKey={1} href='#'>Link</NavItem>
+                        <NavItem eventKey={2} href='#'>Link</NavItem>
+                        <NavDropdown eventKey={3} title='Dropdown' id='basic-nav-dropdown'>
+                          <MenuItem eventKey='1'>Action</MenuItem>
+                          <MenuItem eventKey='2'>Another action</MenuItem>
+                          <MenuItem eventKey='3'>Something else here</MenuItem>
+                          <MenuItem divider />
+                          <MenuItem eventKey='4'>Separated link</MenuItem>
+                        </NavDropdown>
+                      </Nav>
+                    </Navbar.Collapse>
                   </Navbar>
                 </div>
 
diff --git a/react-bootstrap/react-bootstrap.d.ts b/react-bootstrap/react-bootstrap.d.ts
index c63c55e9d..b1d8bd2d3 100644
--- a/react-bootstrap/react-bootstrap.d.ts
+++ b/react-bootstrap/react-bootstrap.d.ts
@@ -441,6 +441,33 @@ declare module "react-bootstrap" {
     interface NavItemClass extends React.ComponentClass<NavItemProps> { }
     var NavItem: NavItemClass;
 
+    // <Navbar.Brand />
+    // ----------------------------------------
+    interface NavbarBrandProps extends React.Props<NavbarBrandClass> {
+    }
+    interface NavbarBrand extends React.ReactElement<NavbarBrandProps> { }
+    interface NavbarBrandClass extends  React.ComponentClass<NavbarBrandProps> { }
+
+    // <Navbar.Collapse />
+    // ----------------------------------------
+    interface NavbarCollapseProps extends React.Props<NavbarCollapseClass> {
+    }
+    interface NavbarCollapse extends React.ReactElement<NavbarCollapseProps> { }
+    interface NavbarCollapseClass extends  React.ComponentClass<NavbarCollapseProps> { }
+
+    // <Navbar.Header />
+    // ----------------------------------------
+    interface NavbarHeaderProps extends React.Props<NavbarHeaderClass> {
+    }
+    interface NavbarHeader extends React.ReactElement<NavbarHeaderProps> { }
+    interface NavbarHeaderClass extends  React.ComponentClass<NavbarHeaderProps> { }
+
+    // <Navbar.Toggle />
+    // ----------------------------------------
+    interface NavbarToggleProps extends React.Props<NavbarToggleClass> {
+    }
+    interface NavbarToggle extends React.ReactElement<NavbarToggleProps> { }
+    interface NavbarToggleClass extends  React.ComponentClass<NavbarToggleProps> { }
 
     // <Navbar />
     // ----------------------------------------
@@ -463,7 +490,12 @@ declare module "react-bootstrap" {
         toggleNavKey?: string | number;
     }
     interface Navbar extends React.ReactElement<NavbarProps> { }
-    interface NavbarClass extends  React.ComponentClass<NavbarProps> { }
+    interface NavbarClass extends React.ComponentClass<NavbarProps> {
+        Brand: NavbarBrandClass;
+        Collapse: NavbarCollapseClass;
+        Header: NavbarHeaderClass;
+        Toggle: NavbarToggleClass;
+    }
     var Navbar: NavbarClass;
     
     // <NavBrand />