diff --git a/Makefile b/Makefile
index 0ac5407fd..c6ce7a74d 100644
--- a/Makefile
+++ b/Makefile
@@ -302,15 +302,16 @@ docs: site apidocs
 
 # build the hledger.org website
 # Requires hakyll (cabal install hakyll)
-site: website/hakyll
-	cd website; ./hakyll build
-	cd website/_site; ln -sf README.html index.html
+.PHONY: site
+site: site/hakyll
+	cd site; ./hakyll build
+	cd site/_site; ln -sf README.html index.html
 
-website/hakyll: website/hakyll.hs
-	cd website; ghc --make hakyll.hs
+site/hakyll: site/hakyll.hs
+	cd site; ghc --make hakyll.hs
 
 viewsite: site
-	$(VIEWHTML) website/_site/index.html
+	$(VIEWHTML) site/_site/index.html
 
 # generate html versions of docs (and the hledger.org website)
 # work around pandoc not handling full rst image directive
diff --git a/website/api-doc-frames.html b/site/api-doc-frames.html
similarity index 100%
rename from website/api-doc-frames.html
rename to site/api-doc-frames.html
diff --git a/website/binaries/HEADER.html b/site/binaries/HEADER.html
similarity index 100%
rename from website/binaries/HEADER.html
rename to site/binaries/HEADER.html
diff --git a/website/hakyll.hs b/site/hakyll.hs
similarity index 100%
rename from website/hakyll.hs
rename to site/hakyll.hs
diff --git a/website/hledger-charts-2.png b/site/hledger-charts-2.png
similarity index 100%
rename from website/hledger-charts-2.png
rename to site/hledger-charts-2.png
diff --git a/website/hledger-screen-1.png b/site/hledger-screen-1.png
similarity index 100%
rename from website/hledger-screen-1.png
rename to site/hledger-screen-1.png
diff --git a/website/site.tmpl b/site/site.tmpl
similarity index 100%
rename from website/site.tmpl
rename to site/site.tmpl
diff --git a/website/sshot.png b/site/sshot.png
similarity index 100%
rename from website/sshot.png
rename to site/sshot.png
diff --git a/website/style.css b/site/style.css
similarity index 100%
rename from website/style.css
rename to site/style.css
diff --git a/website/watchhours.png b/site/watchhours.png
similarity index 100%
rename from website/watchhours.png
rename to site/watchhours.png