diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index fbf2c7506..9de6e49c6 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 1ad16d6fd..c374fb8e5 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -667,7 +667,8 @@
   .btn-navbar {
     display: block;
   }
-  .nav-collapse {
+  .nav-collapse,
+  .nav-collapse.collapse {
     overflow: hidden;
     height: 0;
   }
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index c1d995e30..50fb64dfc 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2804,7 +2804,7 @@ input[type="submit"].btn.btn-mini {
   margin-bottom: 18px;
 }
 .navbar-inner {
-  height: 40px;
+  min-height: 40px;
   padding-left: 20px;
   padding-right: 20px;
   background-color: #2c2c2c;
diff --git a/docs/base-css.html b/docs/base-css.html
index 6ccc216d1..1cb10a806 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -40,7 +40,7 @@
             <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse">
+          <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="">
                 <a href="./index.html">Overview</a>
diff --git a/docs/components.html b/docs/components.html
index 71134045a..13d1598c0 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -40,7 +40,7 @@
             <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse">
+          <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="">
                 <a href="./index.html">Overview</a>
diff --git a/docs/css-tests.html b/docs/css-tests.html
index 0db105796..c2a932b36 100644
--- a/docs/css-tests.html
+++ b/docs/css-tests.html
@@ -40,7 +40,7 @@
             <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse">
+          <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="">
                 <a href="./index.html">Overview</a>
diff --git a/docs/download.html b/docs/download.html
index e4097ea4e..c0e3b9cf0 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -40,7 +40,7 @@
             <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse">
+          <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="">
                 <a href="./index.html">Overview</a>
diff --git a/docs/examples.html b/docs/examples.html
index dffb46fd9..7872a39e8 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -40,7 +40,7 @@
             <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse">
+          <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="">
                 <a href="./index.html">Overview</a>
diff --git a/docs/index.html b/docs/index.html
index f7bbfc2b5..1f526fcdb 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -40,7 +40,7 @@
             <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse">
+          <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="active">
                 <a href="./index.html">Overview</a>
diff --git a/docs/javascript.html b/docs/javascript.html
index 4904eba16..3cba210a1 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -40,7 +40,7 @@
             <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse">
+          <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="">
                 <a href="./index.html">Overview</a>
diff --git a/docs/less.html b/docs/less.html
index 8b02f1961..89e06cf91 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -40,7 +40,7 @@
             <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse">
+          <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="">
                 <a href="./index.html">Overview</a>
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 017fd493e..e2715a2c3 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -40,7 +40,7 @@
             <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse">
+          <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="">
                 <a href="./index.html">Overview</a>
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index d3c06e096..4fdaadb3b 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -40,7 +40,7 @@
             <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse">
+          <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="{{index}}">
                 <a href="./index.html">{{_i}}Overview{{/i}}</a>
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 05930c25e..2a27b00e6 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -40,7 +40,7 @@
             <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse">
+          <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="">
                 <a href="./index.html">Overview</a>
diff --git a/less/navbar.less b/less/navbar.less
index 7d82e84a0..f2f5153a7 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -16,7 +16,7 @@
 
 // Gradient is applied to it's own element because overflow visible is not honored by IE when filter is present
 .navbar-inner {
-  height: @navbarHeight;
+  min-height: @navbarHeight;
   padding-left:  20px;
   padding-right: 20px;
   #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
diff --git a/less/responsive-navbar.less b/less/responsive-navbar.less
index 59e456a22..84b0f33f3 100644
--- a/less/responsive-navbar.less
+++ b/less/responsive-navbar.less
@@ -112,7 +112,7 @@
   }
 
   // Hide everything in the navbar save .brand and toggle button */
-  .nav-collapse {
+  .nav-collapse, .nav-collapse.collapse {
     overflow: hidden;
     height: 0;
   }
@@ -128,4 +128,4 @@
     height: auto !important;
     overflow: visible !important;
   }
-}
+}
\ No newline at end of file