diff --git a/Shake.hs b/Shake.hs
index f972e5784..f6abad1a0 100755
--- a/Shake.hs
+++ b/Shake.hs
@@ -175,6 +175,7 @@ main = do
       need $ 
         webmanpages ++
         [webmanual
+        ,"releasemanual"
         ,hakyllstd
         ]
       cmd Shell (Cwd "site") "hakyll-std/hakyll-std" "build"
@@ -212,6 +213,14 @@ main = do
           "--filter doc/pandoc-demote-headers"
           ">>" webmanual :: Action ExitCode
 
+    -- check out and render manual pages for the current release also
+    phony "releasemanual" $ need [ "releasemanual0.27" ]
+
+    phony "releasemanual0.27" $ do
+      -- XXX under doc so hakyll-std will render it
+      cmd "mkdir -p site/doc/0.27" :: Action ExitCode
+      cmd Shell "git show 0.27:doc/manual.md >site/doc/0.27/manual.md"
+
     -- build standard hakyll script used for site rendering
     hakyllstd %> \out -> do
       let dir = takeDirectory out
@@ -222,7 +231,7 @@ main = do
 
     phony "clean" $ do
       putNormal "Cleaning generated files"
-      removeFilesAfter "." ["hledger/doc/hledger.1.md"]
+      removeFilesAfter "." mdmanpages
       removeFilesAfter "." webmanpages
       removeFilesAfter "." [webmanual]
 
diff --git a/doc/lib.m4 b/doc/lib.m4
index db185e7f3..2897e8e7f 100644
--- a/doc/lib.m4
+++ b/doc/lib.m4
@@ -22,8 +22,8 @@ m4_define({{_shellbold_}}, {{```{.shell .bold .clear}$1```}})m4_dnl
 m4_define({{_journal_}}, {{```{.journal .clear}$1```}})m4_dnl
 m4_define({{_currentrelease_}}, {{0.27}})m4_dnl
 m4_define({{_versions_}},
-{{<div class="versions">
+<div class="versions">
 version:
 <a href="$1.html">dev</a>
-| <a href="_currentrelease_()/$1.html">_currentrelease_()</a>
-</div>}})m4_dnl
+| <a href="doc/_currentrelease_()/manual.html{{#}}m4_patsubst($1,{{hledger-}})">_currentrelease_()</a>
+</div>)m4_dnl
diff --git a/site/.gitignore b/site/.gitignore
index 376cbde55..8cefb0e50 100644
--- a/site/.gitignore
+++ b/site/.gitignore
@@ -12,3 +12,4 @@ journal.md
 timeclock.md
 timedot.md
 manual.md
+[0-9].*
\ No newline at end of file