diff --git a/.gitignore b/.gitignore
index 3097b498fefff663451c2ba08827dff137684808..1beca7f6a14f573634f5cf266f0fefbfdd204f10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -121,6 +121,6 @@
 /.hpc/
 /*.tix
 
-/htools/Ganeti/HTools/Version.hs
 /htools/Ganeti/Constants.hs
+/htools/Ganeti/Version.hs
 /htest/Test/Ganeti/TestImports.hs
diff --git a/Makefile.am b/Makefile.am
index a38a4ec20819aaecea77b3dfc705a107ab79aa51..b5166412f170b3022a083c53b65b868f7301d32e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -380,7 +380,7 @@ HPCEXCL = --exclude Main \
 	--exclude Ganeti.Constants \
 	--exclude Ganeti.THH \
 	--exclude Ganeti.HTools.QC \
-	--exclude Ganeti.HTools.Version \
+	--exclude Ganeti.Version \
 	--exclude Test.Ganeti.TestCommon \
 	--exclude Test.Ganeti.TestHTools \
 	--exclude Test.Ganeti.TestHelper \
@@ -467,7 +467,7 @@ HS_LIBTEST_SRCS = $(HS_LIB_SRCS) $(HS_TEST_SRCS)
 HS_BUILT_SRCS = \
 	htest/Test/Ganeti/TestImports.hs \
 	htools/Ganeti/Constants.hs \
-	htools/Ganeti/HTools/Version.hs
+	htools/Ganeti/Version.hs
 HS_BUILT_SRCS_IN = $(patsubst %,%.in,$(HS_BUILT_SRCS))
 
 $(RUN_IN_TEMPDIR): | stamp-directories
@@ -1106,7 +1106,7 @@ regen-vcs-version:
 	  $(MAKE) $(AM_MAKEFLAGS) vcs-version; \
 	fi
 
-htools/Ganeti/HTools/Version.hs: htools/Ganeti/HTools/Version.hs.in \
+htools/Ganeti/Version.hs: htools/Ganeti/Version.hs.in \
 	vcs-version $(built_base_sources)
 	set -e; \
 	VCSVER=`cat $(abs_top_srcdir)/vcs-version`; \
diff --git a/htools/Ganeti/Daemon.hs b/htools/Ganeti/Daemon.hs
index 80f74f143403a8450e2fbe069be39c714c3636f2..8fe3a83fc407283bb040c5f45daabe142adcc6e2 100644
--- a/htools/Ganeti/Daemon.hs
+++ b/htools/Ganeti/Daemon.hs
@@ -68,7 +68,7 @@ import Ganeti.Logging
 import Ganeti.Runtime
 import Ganeti.BasicTypes
 import Ganeti.HTools.Utils
-import qualified Ganeti.HTools.Version as Version(version)
+import qualified Ganeti.Version as Version (version)
 import qualified Ganeti.Constants as C
 import qualified Ganeti.Ssconf as Ssconf
 
diff --git a/htools/Ganeti/HTools/CLI.hs b/htools/Ganeti/HTools/CLI.hs
index ebdc17488e08db74962e67679a4f7f17045d25ba..6f437c77fd7410a71596b81711e5c79baf1e0240 100644
--- a/htools/Ganeti/HTools/CLI.hs
+++ b/htools/Ganeti/HTools/CLI.hs
@@ -94,7 +94,7 @@ import System.Info
 import System.Exit
 import Text.Printf (printf)
 
-import qualified Ganeti.HTools.Version as Version(version)
+import qualified Ganeti.Version as Version (version)
 import qualified Ganeti.HTools.Container as Container
 import qualified Ganeti.HTools.Node as Node
 import qualified Ganeti.Constants as C
diff --git a/htools/Ganeti/HTools/Version.hs.in b/htools/Ganeti/Version.hs.in
similarity index 72%
rename from htools/Ganeti/HTools/Version.hs.in
rename to htools/Ganeti/Version.hs.in
index d0721e77aa01f85c9ded2bae82bd253f598ca4ff..012be824758e7db1c3013945fefb0f2b6de2be01 100644
--- a/htools/Ganeti/HTools/Version.hs.in
+++ b/htools/Ganeti/Version.hs.in
@@ -2,11 +2,11 @@
 {- | Auto-generated module holding version information.
 -}
 
-module Ganeti.HTools.Version
+module Ganeti.Version
     (
       version
     ) where
 
 -- | The version of the sources.
 version :: String
-version = "(ganeti-htools) version %ver%"
+version = "(ganeti) version %ver%"