diff --git a/Command/Map.hs b/Command/Map.hs
index faaa893924..da7a048a4d 100644
--- a/Command/Map.hs
+++ b/Command/Map.hs
@@ -20,7 +20,7 @@ import qualified Annex
 import Annex.UUID
 import Logs.UUID
 import Logs.Trust
-import Annex.Ssh
+import Remote.Helper.Ssh
 import qualified Utility.Dot as Dot
 
 -- a link from the first repository to the second (its remote)
diff --git a/Remote/Bup.hs b/Remote/Bup.hs
index 04cd490265..37f3e02e09 100644
--- a/Remote/Bup.hs
+++ b/Remote/Bup.hs
@@ -19,7 +19,7 @@ import qualified Git.Command
 import qualified Git.Config
 import qualified Git.Construct
 import Config
-import Annex.Ssh
+import Remote.Helper.Ssh
 import Remote.Helper.Special
 import Remote.Helper.Encryptable
 import Crypto
diff --git a/Remote/Git.hs b/Remote/Git.hs
index 7d034d2425..7964074496 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -13,7 +13,7 @@ import qualified Data.Map as M
 import Common.Annex
 import Utility.CopyFile
 import Utility.RsyncFile
-import Annex.Ssh
+import Remote.Helper.Ssh
 import Types.Remote
 import qualified Git
 import qualified Git.Command
diff --git a/Annex/Ssh.hs b/Remote/Helper/Ssh.hs
similarity index 98%
rename from Annex/Ssh.hs
rename to Remote/Helper/Ssh.hs
index 81e488b41d..7c5eeddb8e 100644
--- a/Annex/Ssh.hs
+++ b/Remote/Helper/Ssh.hs
@@ -5,7 +5,7 @@
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-module Annex.Ssh where
+module Remote.Helper.Ssh where
 
 import Common
 import qualified Git