diff --git a/docs/Makefile b/docs/Makefile
index 29c40a6acd..f74bf5705e 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -47,7 +47,7 @@ docs:
 	-rm -rf $(BUILDDIR)/*
 	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/html
 	cp sources/index.html $(BUILDDIR)/html/
-	cp sources/gettingstarted.html $(BUILDDIR)/html/
+	cp -r sources/gettingstarted $(BUILDDIR)/html/
 	cp sources/dotcloud.yml $(BUILDDIR)/html/
 	cp sources/CNAME $(BUILDDIR)/html/
 	cp sources/.nojekyll $(BUILDDIR)/html/
diff --git a/docs/sources/gettingstarted.html b/docs/sources/gettingstarted/index.html
similarity index 91%
rename from docs/sources/gettingstarted.html
rename to docs/sources/gettingstarted/index.html
index 4b94595027..48de374c1e 100644
--- a/docs/sources/gettingstarted.html
+++ b/docs/sources/gettingstarted/index.html
@@ -13,15 +13,15 @@
     <meta name="viewport" content="width=device-width">
 
     <!-- twitter bootstrap -->
-    <link rel="stylesheet" href="_static/css/bootstrap.min.css">
-    <link rel="stylesheet" href="_static/css/bootstrap-responsive.min.css">
+    <link rel="stylesheet" href="../_static/css/bootstrap.min.css">
+    <link rel="stylesheet" href="../_static/css/bootstrap-responsive.min.css">
 
     <!-- main style file -->
-    <link rel="stylesheet" href="_static/css/main.css">
+    <link rel="stylesheet" href="../_static/css/main.css">
 
     <!-- vendor scripts -->
-    <script src="_static/js/vendor/jquery-1.9.1.min.js" type="text/javascript" ></script>
-    <script src="_static/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js" type="text/javascript" ></script>
+    <script src="../_static/js/vendor/jquery-1.9.1.min.js" type="text/javascript" ></script>
+    <script src="../_static/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js" type="text/javascript" ></script>
 
 </head>
 
@@ -34,8 +34,8 @@
 
             <div style="float: right" class="pull-right">
                 <ul class="nav">
-                    <li><a href="index.html">Introduction</a></li>
-                    <li class="active"><a href="gettingstarted.html">Getting started</a></li>
+                    <li><a href="../">Introduction</a></li>
+                    <li class="active"><a href="./">Getting started</a></li>
                     <li class=""><a href="http://docs.docker.io/en/latest/concepts/containers/">Documentation</a></li>
                 </ul>
 
@@ -46,7 +46,7 @@
             </div>
 
             <div style="margin-left: -12px; float: left;">
-                <a href="index.html"><img style="margin-top: 12px; height: 38px" src="_static/img/docker-letters-logo.gif"></a>
+                <a href="../index.html"><img style="margin-top: 12px; height: 38px" src="../_static/img/docker-letters-logo.gif"></a>
             </div>
         </div>
     </div>
@@ -180,7 +180,7 @@
 
 
 <!-- bootstrap javascipts -->
-<script src="_static/js/vendor/bootstrap.min.js" type="text/javascript"></script>
+<script src="../_static/js/vendor/bootstrap.min.js" type="text/javascript"></script>
 
 <!-- Google analytics -->
 <script type="text/javascript">
diff --git a/docs/sources/index.html b/docs/sources/index.html
index 2432ae7045..abbf9acfb5 100644
--- a/docs/sources/index.html
+++ b/docs/sources/index.html
@@ -34,8 +34,8 @@
 
             <div class="pull-right" >
                 <ul class="nav">
-                    <li class="active"><a href="index.html">Introduction</a></li>
-                    <li ><a href="gettingstarted.html">Getting started</a></li>
+                    <li class="active"><a href="./">Introduction</a></li>
+                    <li ><a href="gettingstarted/">Getting started</a></li>
                     <li class=""><a href="http://docs.docker.io/en/latest/concepts/containers/">Documentation</a></li>
                 </ul>
 
@@ -87,7 +87,7 @@
 
 
                 <div style="display: block; text-align: center;">
-                    <a class="btn btn-custom btn-large" href="gettingstarted.html">Let's get started</a>
+                    <a class="btn btn-custom btn-large" href="gettingstarted/index.html">Let's get started</a>
                 </div>
 
 
diff --git a/docs/theme/docker/layout.html b/docs/theme/docker/layout.html
index fdfaaca2b6..4da65ac629 100755
--- a/docs/theme/docker/layout.html
+++ b/docs/theme/docker/layout.html
@@ -64,8 +64,8 @@
             <div style="float: right" class="pull-right">
                 <ul class="nav">
                     <li><a href="http://www.docker.io/">Introduction</a></li>
-                    <li><a href="http://www.docker.io/gettingstarted.html">Getting started</a></li>
-                    <li class="active"><a href="{{ pathto('documentation/concepts/containers/', 1) }}">Documentation</a></li>
+                    <li><a href="http://www.docker.io/gettingstarted/">Getting started</a></li>
+                    <li class="active"><a href="{{ pathto('concepts/containers/', 1) }}">Documentation</a></li>
                 </ul>
                 <div class="social links" style="float: right; margin-top: 14px; margin-left: 12px">
                     <a class="twitter" href="http://twitter.com/getdocker">Twitter</a>