diff --git a/Cargo.lock b/Cargo.lock
index f39a719..d8d3bc7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -138,6 +138,29 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "conduit"
+version = "0.1.0"
+dependencies = [
+ "directories",
+ "http",
+ "js_int",
+ "log",
+ "pretty_env_logger",
+ "rand",
+ "rocket",
+ "ruma-api",
+ "ruma-client-api",
+ "ruma-events",
+ "ruma-federation-api",
+ "ruma-identifiers",
+ "ruma-signatures",
+ "serde",
+ "serde_json",
+ "sled",
+ "tokio",
+]
+
 [[package]]
 name = "constant_time_eq"
 version = "0.1.5"
@@ -598,29 +621,6 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 
-[[package]]
-name = "matrixserver"
-version = "0.1.0"
-dependencies = [
- "directories",
- "http",
- "js_int",
- "log",
- "pretty_env_logger",
- "rand",
- "rocket",
- "ruma-api",
- "ruma-client-api",
- "ruma-events",
- "ruma-federation-api",
- "ruma-identifiers",
- "ruma-signatures",
- "serde",
- "serde_json",
- "sled",
- "tokio",
-]
-
 [[package]]
 name = "maybe-uninit"
 version = "2.0.0"
diff --git a/Cargo.toml b/Cargo.toml
index 2f9d5ce..92a6681 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,11 @@
 [package]
-name = "matrixserver"
-version = "0.1.0"
+name = "conduit"
+description = "A Matrix homeserver written in Rust"
+license = "AGPL-3.0"
 authors = ["timokoesters <timo@koesters.xyz>"]
+homepage = "https://conduit.rs"
+readme = "README.md"
+version = "0.1.0"
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/README.md b/README.md
index b555f5b..dc91303 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # Conduit
 ### A Matrix homeserver written in Rust
 
-[![Liberapay](http://img.shields.io/liberapay/receives/timokoesters.svg?logo=liberapay)](https://liberapay.com/timokoesters)
-[![Matrix](https://img.shields.io/matrix/conduit:koesters.xyz?server_fqdn=matrix.koesters.xyz)](https://matrix.to/#/#conduit:koesters.xyz)
+[![Liberapay](https://img.shields.io/liberapay/receives/timokoesters?logo=liberapay)](https://liberapay.com/timokoesters)
+[![Matrix](https://img.shields.io/matrix/conduit:koesters.xyz?server_fqdn=matrix.koesters.xyz&logo=matrix)](https://matrix.to/#/#conduit:koesters.xyz)
 
 #### Goals
 
@@ -21,9 +21,10 @@ A Matrix Homeserver that's faster than others.
 - [x] Sync room messages
 - [x] Join rooms, lookup room ids
 - [x] Basic Riot web support
-- [ ] Riot room discovery
+- [x] Riot room discovery
 - [ ] Riot read receipts
 - [ ] Riot presence
+- [ ] Password hashing
 - [ ] Proper room creation
 - [ ] Riot E2EE
 - [ ] Basic federation