diff --git a/Cargo.lock b/Cargo.lock
index c4f80f63c9be..d1f77469699e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5535,6 +5535,7 @@ dependencies = [
  "remote_storage",
  "reqwest",
  "safekeeper_api",
+ "safekeeper_client",
  "scopeguard",
  "sd-notify",
  "serde",
@@ -5572,6 +5573,18 @@ dependencies = [
  "utils",
 ]
 
+[[package]]
+name = "safekeeper_client"
+version = "0.1.0"
+dependencies = [
+ "reqwest",
+ "safekeeper_api",
+ "serde",
+ "thiserror",
+ "utils",
+ "workspace_hack",
+]
+
 [[package]]
 name = "same-file"
 version = "1.0.6"
diff --git a/Cargo.toml b/Cargo.toml
index 0654c25a3d67..056cd5798f84 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,6 +11,7 @@ members = [
     "pageserver/pagebench",
     "proxy",
     "safekeeper",
+    "safekeeper/client",
     "storage_broker",
     "storage_controller",
     "storage_controller/client",
@@ -233,6 +234,7 @@ postgres_initdb = { path = "./libs/postgres_initdb" }
 pq_proto = { version = "0.1", path = "./libs/pq_proto/" }
 remote_storage = { version = "0.1", path = "./libs/remote_storage/" }
 safekeeper_api = { version = "0.1", path = "./libs/safekeeper_api" }
+safekeeper_client = { path = "./safekeeper/client" }
 desim = { version = "0.1", path = "./libs/desim" }
 storage_broker = { version = "0.1", path = "./storage_broker/" } # Note: main broker code is inside the binary crate, so linking with the library shouldn't be heavy.
 storage_controller_client = { path = "./storage_controller/client" }
diff --git a/safekeeper/Cargo.toml b/safekeeper/Cargo.toml
index 0422c46ab10c..086407603f80 100644
--- a/safekeeper/Cargo.toml
+++ b/safekeeper/Cargo.toml
@@ -55,6 +55,7 @@ postgres_ffi.workspace = true
 pq_proto.workspace = true
 remote_storage.workspace = true
 safekeeper_api.workspace = true
+safekeeper_client.workspace = true
 sha2.workspace = true
 sd-notify.workspace = true
 storage_broker.workspace = true
diff --git a/safekeeper/client/Cargo.toml b/safekeeper/client/Cargo.toml
new file mode 100644
index 000000000000..6c5a52de3acf
--- /dev/null
+++ b/safekeeper/client/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "safekeeper_client"
+version = "0.1.0"
+edition.workspace = true
+license.workspace = true
+
+[dependencies]
+safekeeper_api.workspace = true
+thiserror.workspace = true
+reqwest = { workspace = true, features = [ "stream" ] }
+serde.workspace = true
+utils.workspace = true
+workspace_hack = { version = "0.1", path = "../../workspace_hack" }
diff --git a/safekeeper/client/src/lib.rs b/safekeeper/client/src/lib.rs
new file mode 100644
index 000000000000..3963fd466cc8
--- /dev/null
+++ b/safekeeper/client/src/lib.rs
@@ -0,0 +1 @@
+pub mod mgmt_api;
diff --git a/safekeeper/src/http/client.rs b/safekeeper/client/src/mgmt_api.rs
similarity index 96%
rename from safekeeper/src/http/client.rs
rename to safekeeper/client/src/mgmt_api.rs
index 669a9c0ce94b..f78745043a35 100644
--- a/safekeeper/src/http/client.rs
+++ b/safekeeper/client/src/mgmt_api.rs
@@ -2,10 +2,6 @@
 //!
 //! Partially copied from pageserver client; some parts might be better to be
 //! united.
-//!
-//! It would be also good to move it out to separate crate, but this needs
-//! duplication of internal-but-reported structs like WalSenderState, ServerInfo
-//! etc.
 
 use reqwest::{IntoUrl, Method, StatusCode};
 use safekeeper_api::models::TimelineStatus;
diff --git a/safekeeper/src/http/mod.rs b/safekeeper/src/http/mod.rs
index 7229ccb7390b..d82a713f8a93 100644
--- a/safekeeper/src/http/mod.rs
+++ b/safekeeper/src/http/mod.rs
@@ -1,4 +1,3 @@
-pub mod client;
 pub mod routes;
 pub use routes::make_router;
 
diff --git a/safekeeper/src/pull_timeline.rs b/safekeeper/src/pull_timeline.rs
index 00777273cbf9..f2d8e4c85fd7 100644
--- a/safekeeper/src/pull_timeline.rs
+++ b/safekeeper/src/pull_timeline.rs
@@ -5,6 +5,8 @@ use chrono::{DateTime, Utc};
 use futures::{SinkExt, StreamExt, TryStreamExt};
 use postgres_ffi::{XLogFileName, XLogSegNo, PG_TLI};
 use safekeeper_api::{models::TimelineStatus, Term};
+use safekeeper_client::mgmt_api;
+use safekeeper_client::mgmt_api::Client;
 use serde::{Deserialize, Serialize};
 use std::{
     cmp::min,
@@ -22,7 +24,6 @@ use tracing::{error, info, instrument};
 use crate::{
     control_file::CONTROL_FILE_NAME,
     debug_dump,
-    http::client::{self, Client},
     state::{EvictionState, TimelinePersistentState},
     timeline::{Timeline, WalResidentTimeline},
     timelines_global_map::{create_temp_timeline_dir, validate_temp_timeline},
@@ -419,7 +420,7 @@ pub async fn handle_request(
     let http_hosts = request.http_hosts.clone();
 
     // Figure out statuses of potential donors.
-    let responses: Vec<Result<TimelineStatus, client::Error>> =
+    let responses: Vec<Result<TimelineStatus, mgmt_api::Error>> =
         futures::future::join_all(http_hosts.iter().map(|url| async {
             let cclient = Client::new(url.clone(), sk_auth_token.clone());
             let info = cclient