diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a70614281..d69919225 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -209,6 +209,7 @@ dependencies {
     implementation("com.mapbox.mapboxsdk:mapbox-android-core:3.1.0")
     implementation("com.mapbox.mapboxsdk:mapbox-sdk-services:5.3.0")
     implementation("com.etesync:journalmanager:1.1.1")
+    implementation("com.etebase:client:2.3.2")
     implementation("com.github.QuadFlask:colorpicker:0.0.15")
     implementation("androidx.security:security-crypto:1.1.0-alpha02")
     implementation("net.openid:appauth:0.7.1")
diff --git a/app/licenses.yml b/app/licenses.yml
index 0d16d88a3..6a0b70d1b 100644
--- a/app/licenses.yml
+++ b/app/licenses.yml
@@ -889,3 +889,9 @@
   license: The Apache Software License, Version 2.0
   licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
   url: http://github.com/google/tink
+- artifact: com.etebase:client:+
+  name: client
+  copyrightHolder: Tom Hacohen
+  license: LGPL-3.0-only
+  licenseUrl: https://spdx.org/licenses/LGPL-3.0-only.html
+  url: https://www.etebase.com
diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json
index a91263524..61c0924b0 100644
--- a/app/src/main/assets/licenses.json
+++ b/app/src/main/assets/licenses.json
@@ -2116,6 +2116,20 @@
       "normalizedLicense": "apache2",
       "url": "http://github.com/google/tink",
       "libraryName": "tink-android"
+    },
+    {
+      "artifactId": {
+        "name": "client",
+        "group": "com.etebase",
+        "version": "+"
+      },
+      "copyrightHolder": "Tom Hacohen",
+      "copyrightStatement": "Copyright © Tom Hacohen. All rights reserved.",
+      "license": "LGPL-3.0-only",
+      "licenseUrl": "https://spdx.org/licenses/LGPL-3.0-only.html",
+      "normalizedLicense": "lgpl3",
+      "url": "https://www.etebase.com",
+      "libraryName": "client"
     }
   ]
 }
\ No newline at end of file
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index dae8d93ab..2fa5c2a1f 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -15,6 +15,7 @@
   <string name="davx5">DAVx⁵</string>
   <string name="tasks_org">Tasks.org</string>
   <string name="etesync_url">https://api.etesync.com</string>
+  <string name="etebase_url">https://api.etebase.com/partner/tasksorg/</string>
   <string name="help_url_sync">https://tasks.org/sync</string>
 
   <string name="url_davx5">https://tasks.org/davx5</string>
diff --git a/deps_fdroid.txt b/deps_fdroid.txt
index da97f059e..4aa62d7e9 100644
--- a/deps_fdroid.txt
+++ b/deps_fdroid.txt
@@ -385,6 +385,9 @@
 +|    +--- org.apache.commons:commons-collections4:4.1
 +|    +--- org.apache.commons:commons-lang3:3.8.1 -> 3.9
 +|    \--- commons-codec:commons-codec:1.7 -> 1.11
+++--- com.etebase:client:2.3.2
++|    +--- androidx.annotation:annotation:1.1.0
++|    \--- com.squareup.okhttp3:logging-interceptor:3.12.1 -> 3.12.7 (*)
 ++--- com.github.QuadFlask:colorpicker:0.0.15
 +|    \--- androidx.appcompat:appcompat:1.1.0 -> 1.2.0 (*)
 ++--- androidx.security:security-crypto:1.1.0-alpha02
diff --git a/deps_googleplay.txt b/deps_googleplay.txt
index 376723743..67a3e9a89 100644
--- a/deps_googleplay.txt
+++ b/deps_googleplay.txt
@@ -497,6 +497,9 @@
 +|    +--- org.apache.commons:commons-collections4:4.1
 +|    +--- org.apache.commons:commons-lang3:3.8.1 -> 3.9
 +|    \--- commons-codec:commons-codec:1.7 -> 1.11
+++--- com.etebase:client:2.3.2
++|    +--- androidx.annotation:annotation:1.1.0
++|    \--- com.squareup.okhttp3:logging-interceptor:3.12.1 -> 3.12.7 (*)
 ++--- com.github.QuadFlask:colorpicker:0.0.15
 +|    \--- androidx.appcompat:appcompat:1.1.0 -> 1.2.0 (*)
 ++--- androidx.security:security-crypto:1.1.0-alpha02