diff --git a/Cargo.lock b/Cargo.lock
index d672487..f2ca3ea 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1053,7 +1053,8 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 [[package]]
 name = "matrix-qrcode"
 version = "0.1.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk#69225ad00b162e00017cafcd27b0d65de8ae1919"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "292c022b5b3d2f6fe39095497b27f4ec5cbcc6e55d0b20c0c01b8bde07f3f419"
 dependencies = [
  "base64",
  "byteorder",
@@ -1067,7 +1068,8 @@ dependencies = [
 [[package]]
 name = "matrix-sdk"
 version = "0.3.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk#69225ad00b162e00017cafcd27b0d65de8ae1919"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1a9dcccddd5d1e7b13304169021404015fd40a95f56bd895319e9447f7784e6"
 dependencies = [
  "backoff",
  "bytes",
@@ -1092,7 +1094,8 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-base"
 version = "0.3.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk#69225ad00b162e00017cafcd27b0d65de8ae1919"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96e360288b4acb062e4cb3e2952d49b2a93e256438ec749bfffdef701bd0abd0"
 dependencies = [
  "chacha20poly1305",
  "dashmap",
@@ -1117,7 +1120,8 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-common"
 version = "0.3.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk#69225ad00b162e00017cafcd27b0d65de8ae1919"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f595bd52c35ce962ecf52875c5b659f3845cb00b35dd205c7ae62e2b7bdad38"
 dependencies = [
  "async-trait",
  "futures",
@@ -1133,7 +1137,8 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-crypto"
 version = "0.3.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk#69225ad00b162e00017cafcd27b0d65de8ae1919"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "207af21203f5d1787426dbb89c13dc791515448086f098c52ecb9bc591a5b621"
 dependencies = [
  "aes",
  "aes-gcm",
@@ -1230,6 +1235,9 @@ dependencies = [
  "lazy_static",
  "matrix-sdk",
  "rpassword",
+ "ruma-client-api",
+ "ruma-events",
+ "ruma-identifiers",
  "serde",
  "serde-lexpr",
  "tokio",
@@ -2425,9 +2433,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.8.0"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "570c2eb13b3ab38208130eccd41be92520388791207fde783bda7c1e8ace28d4"
+checksum = "c2602b8af3767c285202012822834005f596c811042315fa7e9f5b12b2a43207"
 dependencies = [
  "autocfg",
  "bytes",
diff --git a/Cargo.toml b/Cargo.toml
index ec3a2a0..23562ca 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,10 +1,12 @@
 [package]
 name = "mxadm"
+description = "A simple CLI interface to basic Matrix room admin tasks"
 version = "0.1.0"
 authors = ["Jez Cope <j.cope@erambler.co.uk>"]
 edition = "2018"
 license = "GPL-3.0-or-later"
 repository = "https://tildegit.org/petrichor/mxadm"
+homepage = "https://tildegit.org/petrichor/mxadm"
 readme = "README.md"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -12,8 +14,11 @@ readme = "README.md"
 [dependencies]
 clap = "2.33.3"
 rpassword = "5.0"
-matrix-sdk = { git = "https://github.com/matrix-org/matrix-rust-sdk" }
-tokio = { version = "*", features = ["full"] }
+matrix-sdk = "0.3.*"
+ruma-client-api = "0.11.*"
+ruma-events = "0.23.*"
+ruma-identifiers = "0.19.*"
+tokio = { version = "^1.8.2", features = ["full"] }
 serde = "1.0"
 serde-lexpr = "0.1.0"
 directories = "3.0"
diff --git a/src/commands.rs b/src/commands.rs
index 3ee2880..53639ca 100644
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -1,13 +1,9 @@
 use anyhow::{Context, Result};
-use matrix_sdk::{
-    ruma::{
-        api::client::r0::alias,
-        events::{room::tombstone::TombstoneEventContent, AnyStateEventContent},
-        RoomAliasId, RoomId, UserId,
-    },
-    Client, Session, SyncSettings,
-};
+use matrix_sdk::{Client, Session, SyncSettings};
 use rpassword::prompt_password_stderr;
+use ruma_client_api::r0::alias;
+use ruma_events::{room::tombstone::TombstoneEventContent, AnyStateEventContent};
+use ruma_identifiers::{RoomAliasId, RoomId, UserId};
 use std::convert::TryFrom;
 use std::io::{self, Write};