diff --git a/Makefile b/Makefile
index 915082d7c..52b867b41 100644
--- a/Makefile
+++ b/Makefile
@@ -664,25 +664,26 @@ data/100000x1000x10.journal: tools/generatejournal
 # rebuild all docs
 docs: site codedocs
 
-cleandocs: cleansite
+cleandocs: site-clean
 
-# build the hledger.org website
-# Requires yst (cabal install yst)
+# build some additional static bits of the hledger.org website
+# Requires hakyll-std, a generic hakyll site builder
 .PHONY: site
 site: olddocs
-	-cd site; yst
+	-cd doc/site; hakyll build
 
-cleansite: cleanolddocs
-	rm -rf site/site/*
+site-clean: cleanolddocs
+	-cd doc/site; hakyll clean
+#	rm -rf doc/site/_site/*
 
-sitepreview: site/site
-	cd site; ./site preview
+site-preview: #doc/site/site
+	cd doc/site; hakyll preview
 
-siteview: site
-	$(VIEWHTML) site/_site/index.html
+site-view: site
+	$(VIEWHTML) doc/site/_site/index.html
 
-autosite:
-	cd site; $(AUTOBUILD) site.hs -o site $(PREFERMACUSRLIBFLAGS) --run preview
+# site-auto:
+# 	cd doc/site; $(AUTOBUILD) site.hs -o site $(PREFERMACUSRLIBFLAGS) --run preview
 
 # ensure some old doc versions are in place:
 
@@ -796,16 +797,16 @@ view-haddock-%:
 
 # http://www.cs.york.ac.uk/fp/darcs/hscolour/
 HSCOLOUR=HsColour -css
-hscolour: site/api/src site/api/src/hscolour.css
+hscolour: doc/site/api/src doc/site/api/src/hscolour.css
 	for f in $(HADDOCKSOURCEFILES); do \
-		$(HSCOLOUR) -anchor $$f -osite/api/src/`echo $$f | sed -e's%[^/]*/%%' | sed -e's%/%-%g' | sed -e's%\.hs$$%.html%'` ; \
+		$(HSCOLOUR) -anchor $$f -odoc/site/api/src/`echo $$f | sed -e's%[^/]*/%%' | sed -e's%/%-%g' | sed -e's%\.hs$$%.html%'` ; \
 	done
 
-site/api/src/hscolour.css: site/api/src
-	$(HSCOLOUR) -print-css >site/api/src/hscolour.css
+doc/site/api/src/hscolour.css: doc/site/api/src
+	$(HSCOLOUR) -print-css >doc/site/api/src/hscolour.css
 
-site/api/src:
-	mkdir -p site/api/src
+doc/site/api/src:
+	mkdir -p doc/site/api/src
 
 sourcegraph:
 	for p in $(PACKAGES); do (cd $$p; SourceGraph $$p.cabal); done
diff --git a/site/files/css/bootstrap-theme.css b/doc/site/files/css/bootstrap-theme.css
similarity index 100%
rename from site/files/css/bootstrap-theme.css
rename to doc/site/files/css/bootstrap-theme.css
diff --git a/site/files/css/bootstrap-theme.min.css b/doc/site/files/css/bootstrap-theme.min.css
similarity index 100%
rename from site/files/css/bootstrap-theme.min.css
rename to doc/site/files/css/bootstrap-theme.min.css
diff --git a/site/files/css/bootstrap.css b/doc/site/files/css/bootstrap.css
similarity index 100%
rename from site/files/css/bootstrap.css
rename to doc/site/files/css/bootstrap.css
diff --git a/site/files/css/bootstrap.min.css b/doc/site/files/css/bootstrap.min.css
similarity index 100%
rename from site/files/css/bootstrap.min.css
rename to doc/site/files/css/bootstrap.min.css
diff --git a/site/files/css/style.css b/doc/site/files/css/style.css
similarity index 100%
rename from site/files/css/style.css
rename to doc/site/files/css/style.css
diff --git a/site/files/fonts/glyphicons-halflings-regular.eot b/doc/site/files/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from site/files/fonts/glyphicons-halflings-regular.eot
rename to doc/site/files/fonts/glyphicons-halflings-regular.eot
diff --git a/site/files/fonts/glyphicons-halflings-regular.svg b/doc/site/files/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from site/files/fonts/glyphicons-halflings-regular.svg
rename to doc/site/files/fonts/glyphicons-halflings-regular.svg
diff --git a/site/files/fonts/glyphicons-halflings-regular.ttf b/doc/site/files/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from site/files/fonts/glyphicons-halflings-regular.ttf
rename to doc/site/files/fonts/glyphicons-halflings-regular.ttf
diff --git a/site/files/fonts/glyphicons-halflings-regular.woff b/doc/site/files/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from site/files/fonts/glyphicons-halflings-regular.woff
rename to doc/site/files/fonts/glyphicons-halflings-regular.woff
diff --git a/site/files/images/hledger-charts-2.png b/doc/site/files/images/hledger-charts-2.png
similarity index 100%
rename from site/files/images/hledger-charts-2.png
rename to doc/site/files/images/hledger-charts-2.png
diff --git a/site/files/images/hledger-screen-1.png b/doc/site/files/images/hledger-screen-1.png
similarity index 100%
rename from site/files/images/hledger-screen-1.png
rename to doc/site/files/images/hledger-screen-1.png
diff --git a/site/files/images/hledger-web-journal.png b/doc/site/files/images/hledger-web-journal.png
similarity index 100%
rename from site/files/images/hledger-web-journal.png
rename to doc/site/files/images/hledger-web-journal.png
diff --git a/site/files/images/linux.png b/doc/site/files/images/linux.png
similarity index 100%
rename from site/files/images/linux.png
rename to doc/site/files/images/linux.png
diff --git a/site/files/images/mac.png b/doc/site/files/images/mac.png
similarity index 100%
rename from site/files/images/mac.png
rename to doc/site/files/images/mac.png
diff --git a/site/files/images/sshot.png b/doc/site/files/images/sshot.png
similarity index 100%
rename from site/files/images/sshot.png
rename to doc/site/files/images/sshot.png
diff --git a/site/files/images/watchhours.png b/doc/site/files/images/watchhours.png
similarity index 100%
rename from site/files/images/watchhours.png
rename to doc/site/files/images/watchhours.png
diff --git a/site/files/images/windows.png b/doc/site/files/images/windows.png
similarity index 100%
rename from site/files/images/windows.png
rename to doc/site/files/images/windows.png
diff --git a/site/files/js/bootstrap.js b/doc/site/files/js/bootstrap.js
similarity index 100%
rename from site/files/js/bootstrap.js
rename to doc/site/files/js/bootstrap.js
diff --git a/site/files/js/bootstrap.min.js b/doc/site/files/js/bootstrap.min.js
similarity index 100%
rename from site/files/js/bootstrap.min.js
rename to doc/site/files/js/bootstrap.min.js
diff --git a/site/files/js/highslide/graphics/close.png b/doc/site/files/js/highslide/graphics/close.png
similarity index 100%
rename from site/files/js/highslide/graphics/close.png
rename to doc/site/files/js/highslide/graphics/close.png
diff --git a/site/files/js/highslide/graphics/closeX.png b/doc/site/files/js/highslide/graphics/closeX.png
similarity index 100%
rename from site/files/js/highslide/graphics/closeX.png
rename to doc/site/files/js/highslide/graphics/closeX.png
diff --git a/site/files/js/highslide/graphics/fullexpand.gif b/doc/site/files/js/highslide/graphics/fullexpand.gif
similarity index 100%
rename from site/files/js/highslide/graphics/fullexpand.gif
rename to doc/site/files/js/highslide/graphics/fullexpand.gif
diff --git a/site/files/js/highslide/graphics/geckodimmer.png b/doc/site/files/js/highslide/graphics/geckodimmer.png
similarity index 100%
rename from site/files/js/highslide/graphics/geckodimmer.png
rename to doc/site/files/js/highslide/graphics/geckodimmer.png
diff --git a/site/files/js/highslide/graphics/icon.gif b/doc/site/files/js/highslide/graphics/icon.gif
similarity index 100%
rename from site/files/js/highslide/graphics/icon.gif
rename to doc/site/files/js/highslide/graphics/icon.gif
diff --git a/site/files/js/highslide/graphics/loader.gif b/doc/site/files/js/highslide/graphics/loader.gif
similarity index 100%
rename from site/files/js/highslide/graphics/loader.gif
rename to doc/site/files/js/highslide/graphics/loader.gif
diff --git a/site/files/js/highslide/graphics/loader.white.gif b/doc/site/files/js/highslide/graphics/loader.white.gif
similarity index 100%
rename from site/files/js/highslide/graphics/loader.white.gif
rename to doc/site/files/js/highslide/graphics/loader.white.gif
diff --git a/site/files/js/highslide/graphics/outlines/beveled.png b/doc/site/files/js/highslide/graphics/outlines/beveled.png
similarity index 100%
rename from site/files/js/highslide/graphics/outlines/beveled.png
rename to doc/site/files/js/highslide/graphics/outlines/beveled.png
diff --git a/site/files/js/highslide/graphics/outlines/drop-shadow.png b/doc/site/files/js/highslide/graphics/outlines/drop-shadow.png
similarity index 100%
rename from site/files/js/highslide/graphics/outlines/drop-shadow.png
rename to doc/site/files/js/highslide/graphics/outlines/drop-shadow.png
diff --git a/site/files/js/highslide/graphics/outlines/glossy-dark.png b/doc/site/files/js/highslide/graphics/outlines/glossy-dark.png
similarity index 100%
rename from site/files/js/highslide/graphics/outlines/glossy-dark.png
rename to doc/site/files/js/highslide/graphics/outlines/glossy-dark.png
diff --git a/site/files/js/highslide/graphics/outlines/outer-glow.png b/doc/site/files/js/highslide/graphics/outlines/outer-glow.png
similarity index 100%
rename from site/files/js/highslide/graphics/outlines/outer-glow.png
rename to doc/site/files/js/highslide/graphics/outlines/outer-glow.png
diff --git a/site/files/js/highslide/graphics/outlines/rounded-black.png b/doc/site/files/js/highslide/graphics/outlines/rounded-black.png
similarity index 100%
rename from site/files/js/highslide/graphics/outlines/rounded-black.png
rename to doc/site/files/js/highslide/graphics/outlines/rounded-black.png
diff --git a/site/files/js/highslide/graphics/outlines/rounded-white.png b/doc/site/files/js/highslide/graphics/outlines/rounded-white.png
similarity index 100%
rename from site/files/js/highslide/graphics/outlines/rounded-white.png
rename to doc/site/files/js/highslide/graphics/outlines/rounded-white.png
diff --git a/site/files/js/highslide/graphics/resize.gif b/doc/site/files/js/highslide/graphics/resize.gif
similarity index 100%
rename from site/files/js/highslide/graphics/resize.gif
rename to doc/site/files/js/highslide/graphics/resize.gif
diff --git a/site/files/js/highslide/graphics/zoomin.cur b/doc/site/files/js/highslide/graphics/zoomin.cur
similarity index 100%
rename from site/files/js/highslide/graphics/zoomin.cur
rename to doc/site/files/js/highslide/graphics/zoomin.cur
diff --git a/site/files/js/highslide/graphics/zoomout.cur b/doc/site/files/js/highslide/graphics/zoomout.cur
similarity index 100%
rename from site/files/js/highslide/graphics/zoomout.cur
rename to doc/site/files/js/highslide/graphics/zoomout.cur
diff --git a/site/files/js/highslide/highslide-ie6.css b/doc/site/files/js/highslide/highslide-ie6.css
similarity index 100%
rename from site/files/js/highslide/highslide-ie6.css
rename to doc/site/files/js/highslide/highslide-ie6.css
diff --git a/site/files/js/highslide/highslide.css b/doc/site/files/js/highslide/highslide.css
similarity index 100%
rename from site/files/js/highslide/highslide.css
rename to doc/site/files/js/highslide/highslide.css
diff --git a/site/files/js/highslide/highslide.js b/doc/site/files/js/highslide/highslide.js
similarity index 100%
rename from site/files/js/highslide/highslide.js
rename to doc/site/files/js/highslide/highslide.js
diff --git a/site/files/js/nav.js b/doc/site/files/js/nav.js
similarity index 100%
rename from site/files/js/nav.js
rename to doc/site/files/js/nav.js
diff --git a/site/config.yaml b/site/config.yaml
deleted file mode 100644
index 565ace3f1..000000000
--- a/site/config.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-indexfile : content.yaml
-title     : hledger.org
-sourcedir : [., .., ../doc]
-datadir   : .
-filesdir  : [files]
-layout    : layout.html.st
diff --git a/site/content.yaml b/site/content.yaml
deleted file mode 100644
index 28ba07b2f..000000000
--- a/site/content.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-- title    : Home
-  url      : start
-  source   : README.md
-  data:
-    home: true
-
-- User Manual:
-
-  - title    : Latest
-    url      : MANUAL.html
-    source   : MANUAL.md
-  
-  - title    : 0.22 Manual
-    url      : 0.22/MANUAL.html
-    source   : 0.22/MANUAL.md
-
-  - title    : 0.21 Manual
-    url      : 0.21/MANUAL.html
-    source   : 0.21/MANUAL.md
-
-- title    : Release notes
-  url      : CHANGES.html
-  source   : CHANGES.md
-
-- title    : Installing
-  url      : installing
-  template : null.st
-
-- title    : FAQ
-  url      : faq
-  template : null.st
-
-- title    : How to read CSV files
-  url      : how-to-read-csv-files
-  template : null.st
-
-- title    : How to use account aliases
-  url      : how-to-use-account-aliases
-  template : null.st
-
-- title    : Developer Guide
-  url      : developer-guide
-  template : null.st
-
-- title    : More docs
-  url      : start#documentation
-  template : null.st
-
-- title    : Old downloads
-  url      : DOWNLOAD.html
-  source   : DOWNLOAD.md
-
-- title    : hledger-web demo
-  url      : demo
-  template : null.st
-
diff --git a/site/layout.html.st b/site/layout.html.st
deleted file mode 100644
index 2ed5f8fa7..000000000
--- a/site/layout.html.st
+++ /dev/null
@@ -1,69 +0,0 @@
-<html>
-<head>
-  <title>$pagetitle$ - $sitetitle$</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
-  <link rel="alternate" type="application/rss+xml" title="Joyful Systems blog, hledger tag" href="http://joyful.com/tags/hledger.xml" />
-
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css">
-  <!--[if lt IE 9]>
-   <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-   <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
-  <![endif]-->
-
-  <link rel="stylesheet" href="/css/style.css" />
-  <!-- <link rel="stylesheet" type="text/css" media="print" href="$root$css/print.css" /> -->
-  <style>
-$if(home)$
-h1 { font-size:7em; }
-$endif$
-  </style>
-
-  <!-- <link rel="stylesheet" href="/js/highslide/highslide.css" /> -->
-  <!-- <script src="/js/highslide/highslide.js"></script> -->
-  <!-- <script> -->
-  <!-- 	  hs.graphicsDir = '/js/highslide/graphics/'; -->
-  <!-- 	  hs.outlineType = 'rounded-black'; -->
-  <!-- 	  hs.captionEval = 'this.thumb.title'; -->
-  <!-- </script> -->
-
-  <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3/jquery.min.js"></script>
-  <script src="$root$js/nav.js"></script>
-
-</head>
-<body>
-
-  <a href="https://github.com/simonmichael/hledger"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_green_007200.png" alt="Fork me on GitHub"></a>
-
-  <div class="container">
-    <div class="row">
-	  <div id="nav" class="col-sm-2" style="margin-top:5em;">
-$nav$
-      </div>
-	  <div class="col-sm-10">
-$contents$
-      </div>
-    </div>
-  </div>
-
-  <div id="footer">
-      <hr />
-      &copy; 2007-2014 <a href="http://joyful.com/">Simon Michael</a> and contributors
-  </div>
-
-  <!-- <script src="js/bootstrap.min.js"></script> -->
-
-  <script type="text/javascript">
-      var gaJsHost = (('https:' == document.location.protocol) ? 'https://ssl.' : 'http://www.');
-      document.write(unescape('%3Cscript src=\'' + gaJsHost + 'google-analytics.com/ga.js\' type=\'text/javascript\'%3E%3C/script%3E'));
-  </script>
-  <script type="text/javascript">
-      try {
-      var pageTracker = _gat._getTracker('UA-3456280-3');
-      pageTracker._trackPageview();
-      } catch(err) {}
-  </script>
-
-</body>
-</html>
diff --git a/site/null.st b/site/null.st
deleted file mode 100644
index e69de29bb..000000000