diff --git a/.gitignore b/.gitignore
index 3073a5c1a134bdbb851fc5497fd2576e9e6d362f..fa262293c2a3840d1d4fee862204f90b8659e23f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,7 +98,6 @@
 /htools/.hpc
 /htools/coverage
 
-/htools/hspace
 /htools/htools
 /htools/test
 /htools/*.prof*
diff --git a/Makefile.am b/Makefile.am
index 7597e38270ef8a94ebd249ec54dc85648dff7896..2aa34af908e1b3c841ba081744ba297cd0dbafa4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -306,10 +306,8 @@ docrst = \
 	doc/upgrade.rst \
 	doc/walkthrough.rst
 
-HS_PROGS = \
-	htools/hspace \
-	htools/htools
-HS_BIN_ROLES = hbal hscan
+HS_PROGS = htools/htools
+HS_BIN_ROLES = hbal hscan hspace
 
 HS_ALL_PROGS = $(HS_PROGS) htools/test
 HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS))
@@ -344,6 +342,7 @@ HS_LIB_SRCS = \
 	htools/Ganeti/HTools/Program/Hail.hs \
 	htools/Ganeti/HTools/Program/Hbal.hs \
 	htools/Ganeti/HTools/Program/Hscan.hs \
+	htools/Ganeti/HTools/Program/Hspace.hs \
 	htools/Ganeti/Jobs.hs \
 	htools/Ganeti/Luxi.hs \
 	htools/Ganeti/OpCodes.hs
diff --git a/htools/hspace.hs b/htools/Ganeti/HTools/Program/Hspace.hs
similarity index 99%
rename from htools/hspace.hs
rename to htools/Ganeti/HTools/Program/Hspace.hs
index dec1bf703b6a5b9dca43dcc19348f01c00d4dd6c..b882bfc6c2d80203a9bcb329ee647591aab955f3 100644
--- a/htools/hspace.hs
+++ b/htools/Ganeti/HTools/Program/Hspace.hs
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 
 -}
 
-module Main (main) where
+module Ganeti.HTools.Program.Hspace (main) where
 
 import Control.Monad
 import Data.Char (toUpper, isAlphaNum)
diff --git a/htools/htools.hs b/htools/htools.hs
index acf1a50501ee291b7de2c82c6499a9c8e11cf0be..4ae856f52aa0a1063fec07e54e94ae74332263f2 100644
--- a/htools/htools.hs
+++ b/htools/htools.hs
@@ -33,12 +33,14 @@ import Ganeti.HTools.Utils
 import qualified Ganeti.HTools.Program.Hail as Hail
 import qualified Ganeti.HTools.Program.Hbal as Hbal
 import qualified Ganeti.HTools.Program.Hscan as Hscan
+import qualified Ganeti.HTools.Program.Hspace as Hspace
 
 -- | Supported binaries.
 personalities :: [(String, IO ())]
 personalities = [ ("hail", Hail.main)
                 , ("hbal", Hbal.main)
                 , ("hscan", Hscan.main)
+                , ("hspace", Hspace.main)
                 ]
 
 -- | Display usage and exit.