diff --git a/html/pacemaker/doc/build-1.0.txt b/html/pacemaker/doc/deprecated/build-1.0.txt
similarity index 100%
rename from html/pacemaker/doc/build-1.0.txt
rename to html/pacemaker/doc/deprecated/build-1.0.txt
diff --git a/html/pacemaker/doc/deprecated/build-1.1-crmsh.txt b/html/pacemaker/doc/deprecated/build-1.1-crmsh.txt
new file mode 100644
index 0000000..b6601de
--- /dev/null
+++ b/html/pacemaker/doc/deprecated/build-1.1-crmsh.txt
@@ -0,0 +1 @@
+Generated on Wed Jul  2 18:02:23 EST 2014 from version: 37f0a2b  (HEAD, 1.1)
diff --git a/html/pacemaker/doc/build-1.1-plugin.txt b/html/pacemaker/doc/deprecated/build-1.1-plugin.txt
similarity index 100%
rename from html/pacemaker/doc/build-1.1-plugin.txt
rename to html/pacemaker/doc/deprecated/build-1.1-plugin.txt
diff --git a/html/pacemaker/doc/build-1.1.txt b/html/pacemaker/doc/deprecated/build-1.1.txt
similarity index 100%
rename from html/pacemaker/doc/build-1.1.txt
rename to html/pacemaker/doc/deprecated/build-1.1.txt
diff --git a/html/pacemaker/doc/desc-1.1-crmsh.txt b/html/pacemaker/doc/deprecated/desc-1.1-crmsh.txt
similarity index 100%
rename from html/pacemaker/doc/desc-1.1-crmsh.txt
rename to html/pacemaker/doc/deprecated/desc-1.1-crmsh.txt
diff --git a/html/pacemaker/doc/deprecated/desc-1.1-plugin.txt b/html/pacemaker/doc/deprecated/desc-1.1-plugin.txt
new file mode 100644
index 0000000..0d287d6
--- /dev/null
+++ b/html/pacemaker/doc/deprecated/desc-1.1-plugin.txt
@@ -0,0 +1 @@
+Clusters from Scratch demonstrates Pacemaker 1.1 with Corosync 1.x, its Pacemaker plugin and CMAN
diff --git a/html/pacemaker/doc/Clusters_from_Scratch-1.0-GFS2.pdf b/html/pacemaker/doc/deprecated/en-US/Pacemaker/1.0-openais/pdf/Clusters_from_Scratch_using_GFS2/Clusters_from_Scratch_using_GFS2-en-US.pdf
similarity index 100%
rename from html/pacemaker/doc/Clusters_from_Scratch-1.0-GFS2.pdf
rename to html/pacemaker/doc/deprecated/en-US/Pacemaker/1.0-openais/pdf/Clusters_from_Scratch_using_GFS2/Clusters_from_Scratch_using_GFS2-en-US.pdf
diff --git a/html/pacemaker/doc/Clusters_from_Scratch-1.0-OCFS2.pdf b/html/pacemaker/doc/deprecated/en-US/Pacemaker/1.0-openais/pdf/Clusters_from_Scratch_using_OCFS2/Clusters_from_Scratch_using_OCFS2-en-US.pdf
similarity index 100%
rename from html/pacemaker/doc/Clusters_from_Scratch-1.0-OCFS2.pdf
rename to html/pacemaker/doc/deprecated/en-US/Pacemaker/1.0-openais/pdf/Clusters_from_Scratch_using_OCFS2/Clusters_from_Scratch_using_OCFS2-en-US.pdf
diff --git a/html/pacemaker/doc/title-1.0.txt b/html/pacemaker/doc/deprecated/title-1.0.txt
similarity index 100%
rename from html/pacemaker/doc/title-1.0.txt
rename to html/pacemaker/doc/deprecated/title-1.0.txt
diff --git a/html/pacemaker/doc/title-1.1-crmsh.txt b/html/pacemaker/doc/deprecated/title-1.1-crmsh.txt
similarity index 100%
rename from html/pacemaker/doc/title-1.1-crmsh.txt
rename to html/pacemaker/doc/deprecated/title-1.1-crmsh.txt
diff --git a/html/pacemaker/doc/deprecated/title-1.1-plugin.txt b/html/pacemaker/doc/deprecated/title-1.1-plugin.txt
new file mode 100644
index 0000000..ed8506a
--- /dev/null
+++ b/html/pacemaker/doc/deprecated/title-1.1-plugin.txt
@@ -0,0 +1 @@
+Pacemaker 1.1 for Corosync 1.x
diff --git a/html/pacemaker/doc/desc-1.1-pcs.txt b/html/pacemaker/doc/desc-1.1-pcs.txt
index dda934e..c8291c9 100644
--- a/html/pacemaker/doc/desc-1.1-pcs.txt
+++ b/html/pacemaker/doc/desc-1.1-pcs.txt
@@ -1 +1 @@
-Requires Corosync 2.x
+Clusters From Scratch demonstrates Pacemaker 1.1 with Corosync 2.x
diff --git a/html/pacemaker/doc/desc-1.1-plugin.txt b/html/pacemaker/doc/desc-1.1-plugin.txt
deleted file mode 100644
index 4779bd6..0000000
--- a/html/pacemaker/doc/desc-1.1-plugin.txt
+++ /dev/null
@@ -1 +0,0 @@
-The last version featuring <b>Corosync 1.x</b>, the Pacemaker plugins and <b>CMAN</b>
diff --git a/html/pacemaker/doc/title-1.1-pcs.txt b/html/pacemaker/doc/title-1.1-pcs.txt
index 6739fec..53053d8 100644
--- a/html/pacemaker/doc/title-1.1-pcs.txt
+++ b/html/pacemaker/doc/title-1.1-pcs.txt
@@ -1 +1 @@
-Pacemaker 1.1 for Corosync 2.x
+Pacemaker 1.1
diff --git a/html/pacemaker/doc/title-1.1-plugin.txt b/html/pacemaker/doc/title-1.1-plugin.txt
deleted file mode 100644
index 7a221c9..0000000
--- a/html/pacemaker/doc/title-1.1-plugin.txt
+++ /dev/null
@@ -1 +0,0 @@
-Pacemaker 1.1 for CMAN or Corosync 1.x
diff --git a/src/pacemaker/doc/index.php b/src/pacemaker/doc/index.php
index 9f327d3..ca3c7a8 100644
--- a/src/pacemaker/doc/index.php
+++ b/src/pacemaker/doc/index.php
@@ -1,167 +1,143 @@
 ---
 layout: pacemaker
 title: Pacemaker Documentation
 ---
 <section id="main">
 
   <p>
     Most of the documentation listed here was generated from the Pacemaker 
     sources.
   </p>
 
   <header class="major">
     <h2>Where to Start</h2>
   </header>
   <p>
     If you're new to Pacemaker or clustering in general, the best place to 
     start is <b>Clusters from Scratch</b>, which walks you step-by-step through 
     the installation and configuration of a high-availability cluster with 
     Pacemaker. It even makes common configuration mistakes so that it can
     demonstrate how to fix them.
   </p>
 
   <p>
     On the other hand, if you're looking for an exhaustive reference of all 
     of Pacemaker's options and features, try <b>Pacemaker Explained</b>. It's 
     dry, but should have the answers you're looking for.
   </p>
 
   <p>
     There is also a <a href="https://wiki.clusterlabs.org/wiki">project wiki</a> 
     with examples, how-to guides, and other information that doesn't make it 
     into the manuals.
   </p>
 
   <header class="major">
     <h2>Unversioned documentation</h2>
   </header>
 
   <section class="docset">
     <h3 class="docversion">General Concepts</h3>
     <table class="publican-doc">
       <tr>
         <td>Ordering Explained</td>
         <td>[<a class="doclink" href="https://wiki.clusterlabs.org/w/images/a/ae/Ordering_Explained_-_White.pdf">pdf</a>]</td>
       </tr>
       <tr>
         <td>Colocation Explained</td>
         <td>[<a class="doclink" href="https://wiki.clusterlabs.org/w/images/8/8a/Colocation_Explained_-_White.pdf">pdf</a>]</td>
       </tr>
       <tr>
         <td>Configuring Fencing with crmsh</td>
         <td>[<a class="doclink" href="crm_fencing.html">html</a>]</td>
       </tr>
       <tr>
         <td>ACL Guide</td>
         <td>[<a class="doclink" href="acls.html">html</a>]</td>
       </tr>
     </table>
   </section>
 
   <?php
 
    function get_versions($base) {
      $versions = array();
      foreach (glob("$base/*/Pacemaker/*") as $item)
         if ($item != '.' && $item != '..' && is_dir($item) && !is_link($item))
            $versions[] = basename($item);
 
-     return array_unique($versions);
+     return array_reverse(array_unique($versions));
    }
 
-   function docs_for_version($base, $version) {
+   function docs_for_version($base, $version, $langs) {
      echo "<section class='docset'>";
      echo "<h3 class='docversion'>";
-     foreach (glob("title-$version.txt") as $filename) {
+     foreach (glob("$base/title-$version.txt") as $filename) {
         readfile($filename);
      }
      echo "</h3>";
-     foreach (glob("desc-$version.txt") as $filename) {
+     foreach (glob("$base/desc-$version.txt") as $filename) {
         readfile($filename);
      }
      echo "<br/>";
-     foreach (glob("build-$version.txt") as $filename) {
+     foreach (glob("$base/build-$version.txt") as $filename) {
         readfile($filename);
      }
      echo "<br/>";
 
-     $langs = array();
-     // for now, show only US English; other translations haven't been maintained
-     //foreach (glob("$base/*/Pacemaker/$version") as $item) {
-     //    $langs[] = basename(dirname(dirname($item)));
-     //}
-     $langs[] = "en-US";
-
      $books = array();
      foreach (glob("$base/en-US/Pacemaker/$version/pdf/*") as $filename) {
          $books[] = basename($filename);
      }
 
      echo '<table class="publican-doc">';
      foreach ($books as $b) {
          foreach ($langs as $lang) {
              if (glob("$base/$lang/Pacemaker/$version/pdf/$b/*-$lang.pdf")) {
                  echo '<tr><td>'.str_replace("_", " ", $b)." ($lang)</td>";
 
                  echo '<td>';
                  foreach (glob("$base/$lang/Pacemaker/$version/epub/$b/*.epub") as $filename) {
                      echo " [<a class='doclink' href=$filename>epub</a>]";
                  }
                  foreach (glob("$base/$lang/Pacemaker/$version/pdf/$b/*.pdf") as $filename) {
                      echo " [<a class='doclink' href=$filename>pdf</a>]";
                  }
                  foreach (glob("$base/$lang/Pacemaker/$version/html/$b/index.html") as $filename) {
                      echo " [<a class='doclink' href=$filename>html</a>]";
                  }
                  foreach (glob("$base/$lang/Pacemaker/$version/html-single/$b/index.html") as $filename) {
                      echo " [<a class='doclink' href=$filename>html-single</a>]";
                  }
                  foreach (glob("$base/$lang/Pacemaker/$version/txt/$b/*.txt") as $filename) {
                      echo " [<a class='doclink' href=$filename>txt</a>]";
                  }
                  echo "</td></tr>";
              }
          }
      }
      echo "</table>";
      echo "</section>";
    }
 
-  $docs = array();
-
-  foreach (glob("*.html") as $file) {
-    $fields = explode(".", $file, -1);
-    $docs[] = implode(".", $fields);
-  }
+  echo "<header class='major'>\n<h2>Versioned documentation</h2>\n</header>";
+  $langs = array();
+  // for now, show only US English; other translations haven't been maintained
+  $langs[] = "en-US";
 
-  foreach (glob("*.pdf") as $file) {
-    $fields = explode(".", $file, -1);
-    $docs[] = implode(".", $fields);
+  foreach(get_versions(".") as $v) {
+    docs_for_version(".", $v, $langs);
   }
 
-
-  echo "<header class='major'>\n<h2>Versioned documentation</h2>\n</header>";
-  foreach(get_versions(".") as $v) {
-    docs_for_version(".", $v);
+  echo "<header class='major'>\n<h2>Deprecated documentation</h2>\n</header>";
+  foreach(get_versions("deprecated") as $v) {
+    $langs = array();
+    foreach (glob("deprecated/*/Pacemaker/$v") as $item) {
+      $langs[] = basename(dirname(dirname($item)));
+    }
+    docs_for_version("deprecated", $v, $langs);
   }
 
   ?>
 
-  <header class="major">
-    <h2>Deprecated Documentation</h2>
-  </header>
-  <section class="docset">
-    <h3 class="docversion">Pacemaker 1.0 with OpenAIS</h3>
-    <table class="publican-doc">
-      <tr>
-        <td>Clusters from Scratch - Pacemaker 1.0 &amp; GFS2</td>
-        <td>[<a class="doclink" href="Clusters_from_Scratch-1.0-GFS2.pdf">pdf</a>]</td>
-      </tr>
-      <tr>
-        <td>Clusters from Scratch - Pacemaker 1.0 &amp; OCFS2</td>
-        <td>[<a class="doclink" href="Clusters_from_Scratch-1.0-OCFS2.pdf">pdf</a>]</td>
-      </tr>
-    </table>
-  </section>
-
 </section>