diff --git a/images/client-icons/tensor.png b/images/client-icons/tensor.png
new file mode 100644
index 0000000..f4437c2
Binary files /dev/null and b/images/client-icons/tensor.png differ
diff --git a/src/open/clients/Tensor.js b/src/open/clients/Tensor.js
new file mode 100644
index 0000000..ce22116
--- /dev/null
+++ b/src/open/clients/Tensor.js
@@ -0,0 +1,50 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import {Maturity, Platform, LinkKind, FlathubLink,  style} from "../types.js";
+
+export class Tensor {
+    get id() { return "tensor"; }
+    get name() { return "Tensor"; }
+    get icon() { return "images/client-icons/tensor.png"; }
+    get author() { return "David A Roberts"; }
+    get homepage() { return "https://github.com/davidar/tensor"; }
+    get platforms() { return [Platform.Windows, Platform.macOS, Platform.Linux, Platform.Android, Platform.iOS]; }
+    get description() { return 'QML and JS cross-platform desktop Matrix client'; }
+    getMaturity(platform) { return Maturity.Alpha; }
+    getDeepLink(platform, link) {}
+    canInterceptMatrixToLinks(platform) { return false; }
+
+    getLinkInstructions(platform, link) {
+        switch (link.kind) {
+            case LinkKind.User: return [`Type `, style.code(`/invite ${link.identifier}`)];
+            case LinkKind.Room: return [`Type `, style.code(`/join ${link.identifier}`)];
+        }
+    }
+
+    getCopyString(platform, link) {
+        switch (link.kind) {
+            case LinkKind.User: return `/invite ${link.identifier}`;
+            case LinkKind.Room: return `/join ${link.identifier}`;
+        }
+    }
+
+    getInstallLinks(platform) {
+        if (platform === Platform.Android) {
+            return [new FDroidLink("io.davidar.tensor")];
+        }
+    }
+}
diff --git a/src/open/clients/index.js b/src/open/clients/index.js
index 6a36b10..91ce46b 100644
--- a/src/open/clients/index.js
+++ b/src/open/clients/index.js
@@ -19,6 +19,7 @@ import {Weechat} from "./Weechat.js";
 import {Nheko} from "./Nheko.js";
 import {Fractal} from "./Fractal.js";
 import {Quaternion} from "./Quaternion.js";
+import {Tensor} from "./Tensor.js";
 
 export function createClients() {
 	return [
@@ -26,5 +27,6 @@ export function createClients() {
 		new Weechat(),
         new Nheko(),
         new Quaternion(),
+        new Tensor(),
 	];
 }