diff --git a/Makefile b/Makefile
index 3ce2861773aecd3771329f9af638afd1296c8e41..ddda3b44e96aeb1d669c849c8abe493f7d3895db 100644
--- a/Makefile
+++ b/Makefile
@@ -39,10 +39,11 @@ $(DOCS) : %.html : %
 doc: $(DOCS) Ganeti/HTools/Version.hs
 	rm -rf $(HDDIR)/*
 	mkdir -p $(HDDIR)/Ganeti/HTools
-	cp hscolour.css $(HDDIR)/Ganeti/HTools
+	HsColour -print-css > $(HDDIR)/Ganeti/hscolour.css
+	ln -s ../hscolour.css $(HDDIR)/Ganeti/HTools/hscolour.css
 	for file in $(HSRCS); do \
-		HsColour -css -anchor \
-		$$file > $(HDDIR)/Ganeti/HTools/`basename $$file .hs`.html ; \
+		hfile=`echo $$file|sed 's/\\.hs$$//'`.html; \
+		HsColour -css -anchor $$file > $(HDDIR)/$$hfile ; \
 	done
 	haddock --odir $(HDDIR) --html --ignore-all-exports \
 		-t ganeti-htools -p haddock-prologue \
diff --git a/hscolour.css b/hscolour.css
deleted file mode 100644
index b0dc6e915c9fcf8fa2e95fec99c498a141e059bc..0000000000000000000000000000000000000000
--- a/hscolour.css
+++ /dev/null
@@ -1,6 +0,0 @@
-
-.keyglyph, .layout {color: red;}
-.keyword {color: blue;}
-.comment, .comment a {color: green;}
-.str, .chr {color: teal;}
-.keyword,.conid, .varid, .conop, .varop, .num, .cpp, .sel, .definition {}