diff --git a/Makefile b/Makefile
index 37de2640b..219a45faf 100644
--- a/Makefile
+++ b/Makefile
@@ -978,8 +978,13 @@ site-build: site/hakyll-std/hakyll-std site/manual.md \
 site/docs.md: wiki/_Sidebar.md \
 	$(call def-help,site/docs.md, update docs page with wiki sidebar content which should be in ./wiki/_Sidebar )
 	(sed -ne '1,/<!-- WIKICONTENT -->/ p'     site/docs.md     ; \
-	 sed -ne '/^#/,$$ p'                     wiki/_Sidebar.md \
-		| perl -p -e 's/\[\[([^\]]*)\]\]/[\1](https:\/\/github.com\/simonmichael\/hledger\/wiki\/\1)/g' ; \
+	 sed -ne '/^#.*User/,$$ p'                 wiki/_Sidebar.md \
+	 | perl -p \
+			-e 's/\[\[([^\|]*)\|([^\]]*)\]\]/[\1](https:\/\/github.com\/simonmichael\/hledger\/wiki\/\2)/g;' \
+		  -e 's/\[\[([^\]]*)\]\]/[\1](https:\/\/github.com\/simonmichael\/hledger\/wiki\/\1)/g;' \
+	 | perl -p \
+			-e 's/\[dev\//[/g;' \
+	 ; \
 	 sed -ne '/<!-- ENDWIKICONTENT -->/,$$ p' site/docs.md     ) \
 	> site/_docs.md.$$$$ && \
 	mv site/_docs.md.$$$$ site/docs.md
diff --git a/site/docs.md b/site/docs.md
index ae6498e0b..404db7c76 100644
--- a/site/docs.md
+++ b/site/docs.md
@@ -117,13 +117,10 @@ a file format for human-friendly approximate time logging
 <div class="col-sm-4">
 
 <div id=wiki class=contentbox>
-## Wiki/Cookbook
-
-**[hledger wiki](https://github.com/simonmichael/hledger/wiki)**\
-How-tos, tutorials & tips, including:
-
 <div class=subcontent>
 <!-- WIKICONTENT -->
+## [User Cookbook](https://github.com/simonmichael/hledger/wiki/Home)
+
 ### Getting started
 
 [hledger basics tutorial](https://github.com/simonmichael/hledger/wiki/hledger basics tutorial)  
@@ -170,6 +167,8 @@ How-tos, tutorials & tips, including:
 [ledger-cli.org](http://ledger-cli.org) - [docs](https://www.ledger-cli.org/docs.html) - [wiki](https://github.com/ledger/ledger/wiki)  
 
 [Beancount's docs](http://furius.ca/beancount/doc/index)
+
+## [Dev Zone](https://github.com/simonmichael/hledger/wiki/dev/Dev Zone)
 <!-- ENDWIKICONTENT -->
 </div>
 </div>