diff --git a/Ganeti/HTools/Cluster.hs b/Ganeti/HTools/Cluster.hs
index c7b73501f28cb8b223e0affe30c25dc2cc04f231..c6f8e6c2f0fb14818b0cc419711f680b068e3b1f 100644
--- a/Ganeti/HTools/Cluster.hs
+++ b/Ganeti/HTools/Cluster.hs
@@ -1,7 +1,7 @@
 {-| Implementation of cluster-wide logic.
 
 This module holds all pure cluster-logic; I\/O related functionality
-goes into the "Main" module.
+goes into the "Main" module for the individual binaries.
 
 -}
 
@@ -45,6 +45,7 @@ import Ganeti.HTools.Utils
 
 type NodeList = Container.Container Node.Node
 type InstanceList = Container.Container Instance.Instance
+-- | A separate name for the cluster score type
 type Score = Double
 
 -- | The description of an instance placement.
diff --git a/Ganeti/HTools/Version.hs.in b/Ganeti/HTools/Version.hs.in
index daffa76caf87badce789cafaf61dd4329587d712..8bd4a73611234ee5f30f2edca3082b3441d6f476 100644
--- a/Ganeti/HTools/Version.hs.in
+++ b/Ganeti/HTools/Version.hs.in
@@ -1,6 +1,9 @@
+-- Hey Emacs, this is a -*- haskell -*- file
+
 module Ganeti.HTools.Version
     (
-      version -- ^ the version of the tree
+      version
     ) where
 
+-- | The version of the tree
 version = "(htools) version %ver%"
diff --git a/Makefile b/Makefile
index cf7a0643dc221410c9afe735812a72dae9b1d812..3656ff6bb1da1ce0fe96882f4752eee5f6d273c8 100644
--- a/Makefile
+++ b/Makefile
@@ -24,8 +24,8 @@ doc: $(DOCS)
 	done
 	haddock --odir $(HDDIR) --html --ignore-all-exports \
 		-t htools -p haddock-prologue \
-		--source-module="Ganeti/HTools/%{MODULE/.//}.html" \
-		--source-entity="Ganeti/HTools/%{MODULE/.//}.html#%{NAME}" \
+		--source-module="%{MODULE/.//}.html" \
+		--source-entity="%{MODULE/.//}.html#%{NAME}" \
 		$(HSRCS)
 
 clean: