diff --git a/.gitignore b/.gitignore
index fa3b3d73bf957306d254245ea197ea4a333bbe0b..3073a5c1a134bdbb851fc5497fd2576e9e6d362f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,7 +98,6 @@
 /htools/.hpc
 /htools/coverage
 
-/htools/hscan
 /htools/hspace
 /htools/htools
 /htools/test
diff --git a/Makefile.am b/Makefile.am
index c60eccc5970ee00fe58968b2640f6867ef58c741..7597e38270ef8a94ebd249ec54dc85648dff7896 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -307,10 +307,9 @@ docrst = \
 	doc/walkthrough.rst
 
 HS_PROGS = \
-	htools/hscan \
 	htools/hspace \
 	htools/htools
-HS_BIN_ROLES = hbal
+HS_BIN_ROLES = hbal hscan
 
 HS_ALL_PROGS = $(HS_PROGS) htools/test
 HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS))
@@ -344,6 +343,7 @@ HS_LIB_SRCS = \
 	htools/Ganeti/HTools/Utils.hs \
 	htools/Ganeti/HTools/Program/Hail.hs \
 	htools/Ganeti/HTools/Program/Hbal.hs \
+	htools/Ganeti/HTools/Program/Hscan.hs \
 	htools/Ganeti/Jobs.hs \
 	htools/Ganeti/Luxi.hs \
 	htools/Ganeti/OpCodes.hs
diff --git a/htools/hscan.hs b/htools/Ganeti/HTools/Program/Hscan.hs
similarity index 99%
rename from htools/hscan.hs
rename to htools/Ganeti/HTools/Program/Hscan.hs
index 261fce3ae17dbefa40d43a5480f95179ba0343cb..3fd39cb9d5090ca64e62f2f7c83493bdabe9776d 100644
--- a/htools/hscan.hs
+++ b/htools/Ganeti/HTools/Program/Hscan.hs
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 
 -}
 
-module Main (main) where
+module Ganeti.HTools.Program.Hscan (main) where
 
 import Control.Monad
 import Data.Maybe (isJust, fromJust, fromMaybe)
diff --git a/htools/htools.hs b/htools/htools.hs
index a2c2b482899e3ff2fa7c8ee490448782c03eaa12..acf1a50501ee291b7de2c82c6499a9c8e11cf0be 100644
--- a/htools/htools.hs
+++ b/htools/htools.hs
@@ -32,11 +32,13 @@ import System.IO
 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
 
 -- | Supported binaries.
 personalities :: [(String, IO ())]
 personalities = [ ("hail", Hail.main)
                 , ("hbal", Hbal.main)
+                , ("hscan", Hscan.main)
                 ]
 
 -- | Display usage and exit.