diff --git a/Makefile b/Makefile
index ed441e9d4..0a39d9df0 100644
--- a/Makefile
+++ b/Makefile
@@ -35,6 +35,7 @@ INCLUDEPATHS=\
 	-ihledger-vty \
 	-ihledger-chart
 MAIN=hledger/hledger.hs
+
 # all source files in the project (plus a few strays like Setup.hs & hlint.hs)
 SOURCEFILES:= \
 	hledger/*hs \
@@ -42,21 +43,24 @@ SOURCEFILES:= \
 	hledger-*/*hs \
 	hledger-*/Hledger/*hs \
 	hledger-*/Hledger/*/*hs
+
 # a more careful list suitable for for haddock
 HADDOCKSOURCEFILES:= \
 	hledger-lib/Hledger/*hs \
 	hledger-lib/Hledger/*/*hs \
 	hledger/Hledger/*hs \
 	hledger/Hledger/Cli/*hs \
-	hledger-web/Hledger/*/*hs \
-	hledger-vty/Hledger/*/*hs \
-	hledger-chart/Hledger/*/*hs
+	hledger-web/*hs \
+	hledger-vty/Hledger/*/*hs
+#	hledger-chart/Hledger/*/*hs
+
 # just the library-exporting files for haddock, similar to what hackage shows
 HADDOCKLIBSOURCEFILES:= \
 	hledger-lib/Hledger/*hs \
 	hledger-lib/Hledger/*/*hs \
 	hledger/Hledger/*hs \
 	hledger/Hledger/Cli/*hs
+
 VERSIONHS=hledger/Hledger/Cli/Version.hs
 CABALFILES:= \
 	hledger/hledger.cabal \
@@ -552,7 +556,11 @@ apihaddock: linkhledgerwebdir .haddockprologue
 	 $(HADDOCKLIBSOURCEFILES)
 
 # generate internal code docs for the whole project
-# XXX seems to need ln -s hledger/Hledger
+# Very fragile. Things that may help:
+# ln -s hledger/Hledger
+# ln -s hledger-web/routes
+# cabal install hledger-lib hledger ?
+# mkdir Hledger; cd Hledger; for f in ../hledger{,-lib}/Hledger/*; do ln -s $f; done
 codehaddock: linkhledgerwebdir .haddockprologue
 	$(HADDOCK) --title "hledger internal code docs, all packages" \
 	 -o site/code-doc \
@@ -562,8 +570,8 @@ codehaddock: linkhledgerwebdir .haddockprologue
 	 --source-entity=../code-doc/src/%{MODULE/./-}.html#%N \
 	 $(HADDOCKSOURCEFILES)
 
-#http://www.cs.york.ac.uk/fp/darcs/hscolour/
-HSCOLOUR=HsColour -icss
+# http://www.cs.york.ac.uk/fp/darcs/hscolour/
+HSCOLOUR=HsColour -css
 hscolour:
 	mkdir -p site/code-doc/src
 	for f in $(HADDOCKSOURCEFILES); do \