diff --git a/docs/components/docs/docs.html b/docs/components/docs/docs.html
index 893b9f923aa..3e29d371551 100644
--- a/docs/components/docs/docs.html
+++ b/docs/components/docs/docs.html
@@ -9,10 +9,19 @@ <h1 class="logo">
 
 <article class="main lang-page" role="main">
   <header class="docs-header">
-    <h1 class="page-title">Node.js</h1>
+    <h1 class="page-title">{{pageTitle}}</h1>
+
+    <div class="versions" ng-show="showReference">
+      <span class="v-current">{{version}} <i ng-if="isLatestVersion">(Latest version)</i></span>
+      <a href="#/docs/history" class="v-btn">
+        <img src="img/icon-arrow-bullet.svg" />
+        See version History
+      </a>
+    </div><!-- end of .versions -->
   </header>
 
   <section class="content">
+    <article ng-show="showReference">
     <h1>{{module[0].toUpperCase() + module.substr(1)}}</h1>
     <h3 class="sub-heading">
       <div class="toggler" ng-click="showGcloudDocs = !showGcloudDocs">
@@ -21,107 +30,130 @@ <h3 class="sub-heading">
       </div>
       Getting Started with <code>gcloud</code>
     </h3>
-    <article ng-if="showGcloudDocs">
-      <p>
-        First, install <code>gcloud</code> with npm and require it into your project:
-      </p>
-      <div hljs>$ npm install --save gcloud</div>
-      <div hljs>var gcloud = require('gcloud');</div>
-      <p>
-        There are a couple of ways to use the <code>gcloud</code> module.
-      </p>
-      <p>
-        If you are running your app on Google App Engine or Google Compute Engine, you won't need to worry about supplying connection configuration options to <code>gcloud</code>&mdash; we figure that out for you.
-      </p>
-      <p>
-        However, if you're running your app elsewhere, you will need to provide this information.
-      </p>
-      <div hljs>
-// App Engine and Compute Engine
-var gcloud = require('gcloud');
+      <article ng-if="showGcloudDocs">
+        <h1>{{module[0].toUpperCase() + module.substr(1)}}</h1>
+        <p>
+          First, install <code>gcloud</code> with npm and require it into your project:
+        </p>
+        <div hljs>$ npm install --save gcloud</div>
+        <div hljs>var gcloud = require('gcloud');</div>
+        <p>
+          There are a couple of ways to use the <code>gcloud</code> module.
+        </p>
+        <p>
+          If you are running your app on Google App Engine or Google Compute Engine, you won't need to worry about supplying connection configuration options to <code>gcloud</code>&mdash; we figure that out for you.
+        </p>
+        <p>
+          However, if you're running your app elsewhere, you will need to provide this information.
+        </p>
+        <div hljs>
+  // App Engine and Compute Engine
+  var gcloud = require('gcloud');
 
-// Elsewhere
-var gcloud = require('gcloud')({
-  keyFilename: '/path/to/keyfile.json'
-});</div>
-      <p>
-        In any environment, you are free to provide these and other default properties, which eventually will be passed to the <code>gcloud</code> sub-modules (Datastore, Storage, etc.).
-      </p>
-    </article>
-    <hr>
-    <article ng-if="isActiveDoc('datastore')">
-      <h2>Overview</h2>
-      <p>
-        The <code>gcloud.datastore</code> object gives you some convenience methods, as well as exposes a <code>dataset</code> function. This will allow you to create a <code>dataset</code>, which is the object from which you will interact with the Google Cloud Datastore.
-      </p>
-      <div hljs>
-var datastore = gcloud.datastore;
-var dataset = datastore.dataset({
-  projectId: 'myProject',
-  keyFilename: '/path/to/keyfile.json'
-});</div>
-      <p ng-if="!isActiveUrl('/docs/datastore/dataset')">
-        See <a href="#/docs/datastore/dataset">the Dataset documentation</a> for examples of how to query the datastore, save entities, run a transaction, and others.
-      </p>
-    </article>
-    <article ng-if="isActiveDoc('storage')">
-      <h2>Overview</h2>
-      <p>
-        The <code>gcloud.storage</code> object contains a <code>bucket</code> object, which is how you will interact with your Google Cloud Storage bucket. See the guide on <a href="https://developers.google.com/storage">Google Cloud Storage</a> to create a bucket.
-      </p>
-      <p>
-        See examples below for more on how to access your bucket to upload a file, read its files, create signed URLs, and more.
-      </p>
-    </article>
+  // Elsewhere
+  var gcloud = require('gcloud')({
+    keyFilename: '/path/to/keyfile.json'
+  });</div>
+        <p>
+          In any environment, you are free to provide these and other default properties, which eventually will be passed to the <code>gcloud</code> sub-modules (Datastore, Storage, etc.).
+        </p>
+      </article>
+      <hr>
+      <article ng-if="isActiveDoc('datastore')">
+        <h2>Overview</h2>
+        <p>
+          The <code>gcloud.datastore</code> object gives you some convenience methods, as well as exposes a <code>dataset</code> function. This will allow you to create a <code>dataset</code>, which is the object from which you will interact with the Google Cloud Datastore.
+        </p>
+        <div hljs>
+  var datastore = gcloud.datastore;
+  var dataset = datastore.dataset({
+    projectId: 'myProject',
+    keyFilename: '/path/to/keyfile.json'
+        </div>
+          <p ng-if="!isActiveUrl('/docs/datastore/dataset')">
+            See <a href="#/docs/{{version}}/datastore/dataset">the Dataset documentation</a> for examples of how to query the datastore, save entities, run a transaction, and others.
+          </p>
+        </article>
 
-    <article
-      ng-repeat="method in methods"
-      ng-hide="singleMethod && method.name !== singleMethod">
-      <h2 ng-if="method.name[0].toUpperCase() === method.name[0]">
-        {{method.name}}
-      </h2>
-      <h3
-        class="method-heading"
-        ng-if="method.name[0].toUpperCase() !== method.name[0]">
-        <a
-          class="permalink"
-          ng-if="!noPermalink"
-          ng-href="{{activeUrl + '/' + method.name}}">#</a>
-        {{method.name}}
-      </h3>
-      <p ng-if="method.description" ng-bind-html="method.description"></p>
-      <h4 ng-show="method.params">Parameters</h4>
-      <table class="table" ng-show="method.params">
-        <tbody>
-          <tr ng-repeat="param in method.params">
-            <th scope="row">{{param.name}}</th>
-            <td ng-bind-html="param.types"></td>
-            <td ng-bind-html="param.description"></td>
-          </tr>
-        </tbody>
-      </table>
-      <h4 ng-show="method.returns">Returns</h4>
-      <p ng-show="method.returns" ng-bind-html="method.returns"></p>
-      <h4 ng-show="method.example">Example</h4>
-      <div ng-repeat-end
-        ng-show="method.example"
-        hljs source="method.example" language="js"></div>
-      <hr ng-if="$index < methods.length - 1">
+        <article ng-if="isActiveDoc('storage')">
+          <p>
+            The <code>gcloud.storage</code> object contains a <code>Bucket</code> object, which is how you will interact with your Google Cloud Storage bucket.
+          </p>
+          <div hljs>
+  var storage = gcloud.storage;
+  var bucket = new storage.Bucket({
+    bucketName: 'MyBucket'
+  });</div>
+        <p ng-if="!isActiveUrl('/docs/datastore/dataset')">
+          See <a href="#/docs/datastore/dataset">the Dataset documentation</a> for examples of how to query the datastore, save entities, run a transaction, and others.
+        </p>
+      </article>
+      <article ng-if="isActiveDoc('storage')">
+        <h2>Overview</h2>
+        <p>
+          The <code>gcloud.storage</code> object contains a <code>bucket</code> object, which is how you will interact with your Google Cloud Storage bucket. See the guide on <a href="https://developers.google.com/storage">Google Cloud Storage</a> to create a bucket.
+        </p>
+        <p>
+          See examples below for more on how to access your bucket to upload a file, read its files, create signed URLs, and more.
+        </p>
+      </article>
+
+      <article
+        ng-repeat="method in methods"
+        ng-hide="singleMethod && method.name !== singleMethod">
+        <h2 ng-if="method.name[0].toUpperCase() === method.name[0]">
+          {{method.name}}
+        </h2>
+        <h3
+          class="method-heading"
+          ng-if="method.name[0].toUpperCase() !== method.name[0]">
+          <a
+            class="permalink"
+            ng-if="!noPermalink"
+            ng-href="{{activeUrl + '/' + method.name}}">#</a>
+          {{method.name}}
+        </h3>
+        <p ng-if="method.description" ng-bind-html="method.description"></p>
+        <h4 ng-show="method.params">Parameters</h4>
+        <table class="table" ng-show="method.params">
+          <tbody>
+            <tr ng-repeat="param in method.params">
+              <th scope="row">{{param.name}}</th>
+              <td ng-bind-html="param.types"></td>
+              <td ng-bind-html="param.description"></td>
+            </tr>
+          </tbody>
+        </table>
+        <h4 ng-show="method.returns">Returns</h4>
+        <p ng-show="method.returns" ng-bind-html="method.returns"></p>
+        <h4 ng-show="method.example">Example</h4>
+        <div ng-repeat-end
+          ng-show="method.example"
+          hljs source="method.example" language="js"></div>
+        <hr ng-if="$index < methods.length - 1">
+      </article>
+    </article>
+    <article ng-show="showHistory">
+      <ul class="v-list">
+        <li ng-repeat="version in versions">
+          <a ng-href="#/docs/{{version}}">{{version}}</a>
+        </li>
+      </ul>
     </article>
   </section><!-- end of .content -->
 
   <nav class="side-nav">
-    <ul class="page-sections">
+    <ul class="page-sections" ng-show="showReference">
       <li ng-repeat="page in pages">
         <a
-          ng-class="{ current: isActiveUrl(page.url) }"
+          ng-class="{ current: docs.isActiveUrl(page.url) }"
           ng-href="{{page.url}}">
           {{page.title}}
         </a>
         <ul class="sub-sections" ng-if="page.pages">
           <li ng-repeat="innerPage in page.pages">
             <a
-              ng-class="{ current: isActiveUrl(page.url + innerPage.url) }"
+              ng-class="{ current: docs.isActiveUrl(page.url + innerPage.url) }"
               ng-href="{{page.url + innerPage.url}}">
               {{innerPage.title}}
             </a>
diff --git a/docs/components/docs/docs.js b/docs/components/docs/docs.js
index af55d4e7361..fe0f1387a28 100644
--- a/docs/components/docs/docs.js
+++ b/docs/components/docs/docs.js
@@ -1,9 +1,9 @@
 angular
-  .module('gcloud.docs', ['ngRoute', 'hljs'])
-  .config(function($routeProvider) {
+  .module('gcloud.docs', ['ngRoute', 'hljs', 'config'])
+  .config(function($routeProvider, versions) {
     'use strict';
 
-    function filterDocJson($sce) {
+    function filterDocJson($sce, version) {
       // Transform JSON response to remove extraneous objects, such as copyright
       // notices & use strict directives.
       function formatHtml(str) {
@@ -42,7 +42,7 @@ angular
         };
         var a = document.createElement('a');
         return str.replace(regex.see, function(match, module) {
-          a.href = '#/docs/' + module;
+          a.href = '#/docs/' + version + '/' + module;
           a.innerText = module;
           return a.outerHTML;
         });
@@ -103,7 +103,7 @@ angular
       };
     }
 
-    function setMethod($location, methodName) {
+    function setMethod($location, methodName, version) {
       return function(methods) {
         var methodExists = methods.some(function(methodObj) {
           return methodName === methodObj.name;
@@ -112,7 +112,7 @@ angular
           methods.singleMethod = methodName;
           return methods;
         } else {
-          $location.path('/docs/' + module + '/' + cl);
+          $location.path('/docs/' + version + '/' + module + '/' + cl);
         }
       };
     }
@@ -124,12 +124,20 @@ angular
 
     $routeProvider
       .when('/docs', {
+        redirectTo: '/docs/' + versions[0]
+      })
+      .when('/docs/history', {
+        controller: 'HistoryCtrl',
+        templateUrl: 'components/docs/docs.html'
+      })
+      .when('/docs/:version', {
         controller: 'DocsCtrl',
         templateUrl: 'components/docs/docs.html',
         resolve: {
-          methods: function($http, $sce) {
-            return $http.get('json/index.json')
-                .then(filterDocJson($sce))
+          methods: function($http, $route, $sce) {
+            var version = $route.current.params.version;
+            return $http.get('json/' + version + '/index.json')
+                .then(filterDocJson($sce, version))
                 .then(function(methods) {
                   // Prevent displaying permalinks.
                   // ** Can remove when PubSub api is documented **
@@ -139,54 +147,57 @@ angular
           }
         }
       })
-      .when('/docs/:module', {
+      .when('/docs/:version/:module', {
         controller: 'DocsCtrl',
         templateUrl: 'components/docs/docs.html',
         resolve: {
           methods: function($http, $route, $sce) {
+            var version = $route.current.params.version;
             var module = $route.current.params.module;
-            return $http.get('json/' + module + '/index.json')
-                .then(filterDocJson($sce));
+            return $http.get('json/' + version + '/' + module + '/index.json')
+                .then(filterDocJson($sce, version));
           }
         }
       })
-      .when('/docs/:module/:class', {
+      .when('/docs/:version/:module/:class', {
         controller: 'DocsCtrl',
         templateUrl: 'components/docs/docs.html',
         resolve: {
           methods: function($q, $http, $route, $sce, $location) {
+            var version = $route.current.params.version;
             var module = $route.current.params.module;
             var cl = $route.current.params.class;
             if (MODULE_TO_CLASSES[module].length > 0) {
               return $http
-                  .get('json/' + module + '/' + cl + '.json')
-                  .then(filterDocJson($sce));
+                  .get('json/' + version + '/' + module + '/' + cl + '.json')
+                  .then(filterDocJson($sce, version));
             } else {
               // This is not a class, this is the name of a method.
               var method = cl;
-              return $http.get('json/' + module + '/index.json')
-                  .then(filterDocJson($sce))
-                  .then(setMethod($location, method));
+              return $http.get('json/' + version + '/' +module + '/index.json')
+                  .then(filterDocJson($sce, version))
+                  .then(setMethod($location, method, version));
             }
           }
         }
       })
-      .when('/docs/:module/:class/:method', {
+      .when('/docs/:version/:module/:class/:method', {
         controller: 'DocsCtrl',
         templateUrl: 'components/docs/docs.html',
         resolve: {
           methods: function($q, $http, $route, $sce, $location) {
+            var version = $route.current.params.version;
             var module = $route.current.params.module;
             var cl = $route.current.params.class;
             var method = $route.current.params.method;
-            return $http.get('json/' + module + '/' + cl + '.json')
-                .then(filterDocJson($sce))
-                .then(setMethod($location, method));
+            return $http.get('json/' + version + '/' + module + '/' + cl + '.json')
+                .then(filterDocJson($sce, version))
+                .then(setMethod($location, method, version));
           }
         }
       });
   })
-  .controller('DocsCtrl', function($location, $scope, $routeParams, methods) {
+  .controller('DocsCtrl', function($location, $scope, $routeParams, methods, $http, versions) {
     'use strict';
 
     $scope.isActiveUrl = function(url) {
@@ -201,19 +212,29 @@ angular
       return doc.toLowerCase() === $routeParams.module;
     };
 
+    $scope.pageTitle = 'Node.js';
+    $scope.showReference = true;
     $scope.activeUrl = '#' + $location.path();
     $scope.singleMethod = methods.singleMethod;
     $scope.noPermalink = methods.singleMethod || methods.noPermalink;
     $scope.methods = methods;
     $scope.module = $routeParams.module;
+    $scope.version = $routeParams.version;
+    $scope.isLatestVersion = $scope.version == versions[0];
+    $scope.versions = versions;
+    var baseUrl = '#/docs/' + $scope.version;
+    /*
+    TODO(silvano): future versions will introduce new pages, so the list below will have
+    to be generated according to the specific version
+    */
     $scope.pages = [
       {
         title: 'gcloud',
-        url: '#/docs'
+        url: baseUrl
       },
       {
         title: 'Datastore',
-        url: '#/docs/datastore',
+        url: baseUrl + '/datastore',
         pages: [
           {
             title: 'Dataset',
@@ -227,7 +248,12 @@ angular
       },
       {
         title: 'Storage',
-        url: '#/docs/storage'
+        url: baseUrl + '/storage'
       }
     ];
+  })
+  .controller("HistoryCtrl", function($scope, versions) {
+    $scope.pageTitle = 'Node.js Docs Versions';
+    $scope.showHistory = true;
+    $scope.versions = versions;
   });
diff --git a/docs/json/datastore/.gitkeep b/docs/components/docs/history.html
similarity index 100%
rename from docs/json/datastore/.gitkeep
rename to docs/components/docs/history.html
diff --git a/docs/home.html b/docs/home.html
index 93a1ef5d592..652efa81465 100755
--- a/docs/home.html
+++ b/docs/home.html
@@ -24,8 +24,8 @@ <h2>One-line npm install</h2>
     <div class="container">
       <ul class="featuring-links">
         <li>
-          <a href="#/docs" title="gcloud-node docs" class="btn btn-docs">
-            <img src="img/icon-lang-nodejs.svg" alt="Node.js icon">
+          <a href="#/docs/{{latestVersion}}" title="gcloud-node docs" class="btn btn-docs">
+            <img src="img/icon-lang-nodejs.svg" alt="Node.js icon" />
             Read the Docs
           </a>
         </li>
@@ -121,7 +121,6 @@ <h4>What is the relationship between <code>gcloud</code>
       and is the recommended way to integrate Google Cloud APIs into your
       Node.js applications. If your application requires both Google Cloud and
       other Google APIs, the 2 libraries may be used by your application.</p>
-
       </div>
   </section> <!-- end of FAQ -->
 </article><!-- end of .main -->
diff --git a/docs/home.js b/docs/home.js
index 201dd9b54ce..b2d55592900 100644
--- a/docs/home.js
+++ b/docs/home.js
@@ -1,13 +1,19 @@
 angular
-  .module('gcloud', ['ngRoute', 'hljs', 'gcloud.docs'])
+  .module('gcloud', ['ngRoute', 'hljs', 'gcloud.docs', 'config'])
   .config(function($routeProvider) {
     'use strict';
 
     $routeProvider
       .when('/', {
-        templateUrl: 'home.html'
+        templateUrl: 'home.html',
+        controller: 'HomeCtrl'
       });
   })
+  .controller('HomeCtrl', function($scope, versions) {
+    'use strict';
+    $scope.latestVersion = versions[0];
+
+  })
   .run(function($rootScope, $location) {
     'use strict';
 
diff --git a/docs/img/icon-arrow-bullet.svg b/docs/img/icon-arrow-bullet.svg
new file mode 100755
index 00000000000..dd9acb566eb
--- /dev/null
+++ b/docs/img/icon-arrow-bullet.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Camada_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="10px" height="10px" viewBox="1 -0.5 10 10" enable-background="new 1 -0.5 10 10" xml:space="preserve">
+<polygon fill="#020202" points="5.745,4.594 2.708,7.632 4.576,9.5 9.48,4.594 4.387,-0.5 2.52,1.369 "/>
+</svg>
diff --git a/docs/index.html b/docs/index.html
index 766608b2d73..daeec618fc7 100755
--- a/docs/index.html
+++ b/docs/index.html
@@ -15,7 +15,7 @@
     <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Droid+Sans+Mono|Roboto:300,400,700,700italic,400italic|Open+Sans:300">
     <link rel="stylesheet" href="//yandex.st/highlightjs/8.0/styles/github.min.css">
   </head>
-  <body ng-app="gcloud">
+  <body>
     <!--[if lt IE 7]>
       <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
     <![endif]-->
@@ -30,6 +30,21 @@
     <script src="components/docs/docs.js"></script>
 
     <script>
+      (function() {
+        var initInjector = angular.injector(['ng']);
+        var $http = initInjector.get('$http');
+        $http.get('versions.txt').then(
+          function (response) {
+            var trimmed = response.data.replace(/^\s+|\s+$/g, '');
+            var versions = trimmed.split("\n").reverse();
+            angular.module('config', []).constant('versions', versions);
+            angular.element(document).ready(function() {
+              angular.bootstrap(document, ['gcloud']);
+            });
+          }
+        );
+      })();
+
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
       m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
diff --git a/docs/json/storage/.gitkeep b/docs/json/master/datastore/.gitkeep
similarity index 100%
rename from docs/json/storage/.gitkeep
rename to docs/json/master/datastore/.gitkeep
diff --git a/docs/json/master/storage/.gitkeep b/docs/json/master/storage/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/docs/versions.txt b/docs/versions.txt
new file mode 100644
index 00000000000..8b25206ff90
--- /dev/null
+++ b/docs/versions.txt
@@ -0,0 +1 @@
+master
\ No newline at end of file
diff --git a/package.json b/package.json
index b5a6d8fda14..9d9c6dca7c4 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
     "tmp": "0.0.24"
   },
   "scripts": {
-    "docs": "dox < lib/index.js > docs/json/index.json & dox < lib/datastore/dataset.js > docs/json/datastore/dataset.json & dox < lib/datastore/index.js > docs/json/datastore/index.json & dox < lib/datastore/query.js > docs/json/datastore/query.json & dox < lib/storage/index.js > docs/json/storage/index.json",
+    "docs": "dox < lib/index.js > docs/json/master/index.json & dox < lib/datastore/dataset.js > docs/json/master/datastore/dataset.json & dox < lib/datastore/index.js > docs/json/master/datastore/index.json & dox < lib/datastore/query.js > docs/json/master/datastore/query.json & dox < lib/storage/index.js > docs/json/master/storage/index.json",
     "lint": "jshint lib/ regression/ test/",
     "test": "mocha --recursive --reporter spec",
     "regression-test": "mocha regression/datastore.js regression/storage.js --reporter spec --timeout 15000",