diff --git a/.gitmodules b/.gitmodules
index f14a83d7..6b8e9874 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "external/components"]
 	path = external/components
 	url = https://github.com/revoltchat/components
+[submodule "external/revolt.js"]
+	path = external/revolt.js
+	url = https://github.com/revoltchat/revolt.js
diff --git a/README.md b/README.md
index a2a6302e..1d9c4c9d 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ Get revite up and running locally.
 git clone --recursive https://github.com/revoltchat/revite
 cd revite
 yarn
-yarn build:components
+yarn build:deps
 yarn dev
 ```
 
@@ -56,7 +56,7 @@ You can now access the client at http://local.revolt.chat:3000.
 | `yarn pull`                             | Setup assets required for Revite.            |
 | `yarn dev`                              | Start the Revolt client in development mode. |
 | `yarn build`                            | Build the Revolt client.                     |
-| `yarn build:components`                 | Build the Revolt components library.         |
+| `yarn build:deps`                       | Build external dependencies.                 |
 | `yarn preview`                          | Start a local server with the built client.  |
 | `yarn lint`                             | Run ESLint on the client.                    |
 | `yarn fmt`                              | Run Prettier on the client.                  |
diff --git a/external/revolt.js b/external/revolt.js
new file mode 160000
index 00000000..044b1b91
--- /dev/null
+++ b/external/revolt.js
@@ -0,0 +1 @@
+Subproject commit 044b1b91ee583bfb89fff140ecda29a32f6535aa
diff --git a/package.json b/package.json
index c54ce4ce..34a82028 100644
--- a/package.json
+++ b/package.json
@@ -3,8 +3,8 @@
     "scripts": {
         "dev": "node scripts/setup_assets.js --check && vite",
         "pull": "node scripts/setup_assets.js",
-        "build:components": "cd external && cd components && yarn && yarn build:esm",
-        "build": "yarn && rimraf build && node scripts/setup_assets.js --check && yarn build:components && vite build",
+        "build:deps": "cd external && cd components && yarn && yarn build:esm && cd .. && cd revolt.js && yarn && yarn build",
+        "build": "yarn && rimraf build && node scripts/setup_assets.js --check && yarn build:deps && vite build",
         "build:highmem": "NODE_OPTIONS='--max-old-space-size=4096' yarn build",
         "preview": "vite preview",
         "lint": "eslint src/**/*.{js,jsx,ts,tsx}",
@@ -44,7 +44,6 @@
         }
     },
     "dependencies": {
-        "@revoltchat/ui": "^1.0.77",
         "fs-extra": "^10.0.0",
         "klaw": "^3.0.0",
         "sirv-cli": "^1.0.14",
@@ -77,6 +76,7 @@
         "@hcaptcha/react-hcaptcha": "^0.3.6",
         "@insertish/vite-plugin-babel-macros": "^1.0.5",
         "@preact/preset-vite": "^2.0.0",
+        "@revoltchat/ui": "^1.0.77",
         "@rollup/plugin-replace": "^2.4.2",
         "@styled-icons/boxicons-logos": "^10.38.0",
         "@styled-icons/boxicons-regular": "^10.38.0",
@@ -169,6 +169,7 @@
     "license": "MIT",
     "packageManager": "yarn@3.2.0",
     "resolutions": {
-        "@revoltchat/ui": "portal:external/components"
+        "@revoltchat/ui": "portal:external/components",
+        "revolt.js": "portal:external/revolt.js"
     }
 }
diff --git a/yarn.lock b/yarn.lock
index 17abcfb6..9c836b65 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8023,9 +8023,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"revolt.js@npm:6.0.17":
-  version: 6.0.17
-  resolution: "revolt.js@npm:6.0.17"
+"revolt.js@portal:external/revolt.js::locator=client%40workspace%3A.":
+  version: 0.0.0-use.local
+  resolution: "revolt.js@portal:external/revolt.js::locator=client%40workspace%3A."
   dependencies:
     "@insertish/exponential-backoff": 3.1.0-patch.2
     "@insertish/isomorphic-ws": ^4.0.1
@@ -8039,9 +8039,8 @@ __metadata:
     revolt-api: 0.5.5-3
     ulid: ^2.3.0
     ws: ^8.2.2
-  checksum: 2879483d0a3035dbca67da52ff9d74e9f2cc7e7e5421f95605ae99c38f501180e74b95b3482577c0256431b11ba867687da678a6be2bbdb672c39baebe69c13a
   languageName: node
-  linkType: hard
+  linkType: soft
 
 "rimraf@npm:^3.0.2":
   version: 3.0.2