diff --git a/gradlew-fdroid b/gradlew-fdroid
index 20baf5f9..9742faa7 100755
--- a/gradlew-fdroid
+++ b/gradlew-fdroid
@@ -120,6 +120,7 @@ get_sha() {
                     ["5.3.1"]="1c59a17a054e9c82f0dd881871c9646e943ec4c71dd52ebc6137d17f82337436" \
                     ["5.4"]="c8c17574245ecee9ed7fe4f6b593b696d1692d1adbfef425bef9b333e3a0e8de" \
                     ["5.4.1"]="7bdbad1e4f54f13c8a78abc00c26d44dd8709d4aedb704d913fb1bb78ac025dc" \
+                    ["5.5"]="8d78b2ed63e7f07ad169c1186d119761c4773e681f332cfe1901045b1b0141bc" \
                     )
     [ ! ${gradle_hashes[$1]+abc} ] && exit 1
     echo "${gradle_hashes["$1"]}"
@@ -141,7 +142,7 @@ d_plugin_k=(3.3 3.2 3.1 3.0 2.3    2.2  2.1.3  2.1  2.0 1.5 1.3 1.2   1.1   1.0
 d_plugin_v=(4.10.1 4.6 4.4 4.1 3.3 2.14.1 2.14.1 2.12 2.12 2.4 2.4 2.3 2.2.1 2.2.1  2.1  2.1 1.12 1.12 1.12 1.11 1.10 1.9 1.8 1.6 1.6 1.4 1.4)
 
 # All gradle versions we know about
-plugin_v=(5.4.1 5.4 5.3.1 5.3 5.2.1 5.2 5.1.1 5.1 5.0 4.10.3 4.10.2 4.10.1 4.10 4.9 4.8.1 4.8 4.7 4.6 4.5.1 4.5 4.4.1 4.4 4.3.1 4.3 4.2.1 4.2 4.1 4.0.2 4.0.1 4.0 3.5.1 3.5 3.4.1 3.4 3.3 3.2.1 3.2 3.1 3.0 2.14.1 2.14 2.13 2.12 2.11 2.10 2.9 2.8 2.7 2.6 2.5 2.4 2.3 2.2.1 2.2 2.1 1.12 1.11 1.10 1.9 1.8 1.7 1.6 1.4)
+plugin_v=(5.5 5.4.1 5.4 5.3.1 5.3 5.2.1 5.2 5.1.1 5.1 5.0 4.10.3 4.10.2 4.10.1 4.10 4.9 4.8.1 4.8 4.7 4.6 4.5.1 4.5 4.4.1 4.4 4.3.1 4.3 4.2.1 4.2 4.1 4.0.2 4.0.1 4.0 3.5.1 3.5 3.4.1 3.4 3.3 3.2.1 3.2 3.1 3.0 2.14.1 2.14 2.13 2.12 2.11 2.10 2.9 2.8 2.7 2.6 2.5 2.4 2.3 2.2.1 2.2 2.1 1.12 1.11 1.10 1.9 1.8 1.7 1.6 1.4)
 
 v_all=${plugin_v[@]}
 
diff --git a/makebuildserver b/makebuildserver
index ed037da8..9b1083d1 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -352,6 +352,8 @@ CACHE_FILES = [
      '1c59a17a054e9c82f0dd881871c9646e943ec4c71dd52ebc6137d17f82337436'),
     ('https://downloads.gradle.org/distributions/gradle-5.4.1-bin.zip',
      '7bdbad1e4f54f13c8a78abc00c26d44dd8709d4aedb704d913fb1bb78ac025dc'),
+    ('https://services.gradle.org/distributions/gradle-5.5-bin.zip',
+     '8d78b2ed63e7f07ad169c1186d119761c4773e681f332cfe1901045b1b0141bc'),
     ('https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin',
      '102d6723f67ff1384330d12c45854315d6452d6510286f4e5891e00a5a8f1d5a'),
     ('https://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip',