diff --git a/metadata/org.xbmc.kodi.yml b/metadata/org.xbmc.kodi.yml
index 10ec051c5f..03c6f07d2c 100644
--- a/metadata/org.xbmc.kodi.yml
+++ b/metadata/org.xbmc.kodi.yml
@@ -28,7 +28,7 @@ Builds:
       - apt-get install -y build-essential default-jdk gawk lib32stdc++6 lib32z1 lib32z1-dev
         libcurl4-openssl-dev zlib1g-dev groovy libcommons-lang-java python-dev
     patch:
-      - groovy.patch
+      - 18.0-groovy.patch
     output: build/tools/android/packaging/images/*.apk
     rm:
       - tools/codegenerator/groovy/
@@ -64,7 +64,7 @@ Builds:
       - apt-get install -y build-essential default-jdk gawk lib32stdc++6 lib32z1 lib32z1-dev
         libcurl4-openssl-dev zlib1g-dev groovy libcommons-lang-java python-dev
     patch:
-      - groovy.patch
+      - 18.0-groovy.patch
     output: build/tools/android/packaging/images/*.apk
     rm:
       - tools/codegenerator/groovy/
@@ -100,7 +100,7 @@ Builds:
       - apt-get install -y build-essential default-jdk gawk lib32stdc++6 lib32z1 lib32z1-dev
         libcurl4-openssl-dev zlib1g-dev groovy libcommons-lang-java python-dev
     patch:
-      - groovy.patch
+      - 18.0-groovy.patch
     output: build/tools/android/packaging/images/*.apk
     rm:
       - tools/codegenerator/groovy/
@@ -137,7 +137,7 @@ Builds:
       - apt-get install -y build-essential default-jdk gawk lib32stdc++6 lib32z1 lib32z1-dev
         libcurl4-openssl-dev zlib1g-dev groovy libcommons-lang-java python-dev
     patch:
-      - groovy.patch
+      - 18.0-groovy.patch
     output: build/tools/android/packaging/xbmc/build/outputs/apk/releaseUnsigned/xbmc-releaseUnsigned-unsigned.apk
     rm:
       - tools/codegenerator/groovy/
@@ -176,7 +176,7 @@ Builds:
       - apt-get install -y build-essential default-jdk gawk lib32stdc++6 lib32z1 lib32z1-dev
         libcurl4-openssl-dev zlib1g-dev groovy libcommons-lang-java python-dev
     patch:
-      - groovy.patch
+      - 18.0-groovy.patch
     output: build/tools/android/packaging/xbmc/build/outputs/apk/releaseUnsigned/xbmc-releaseUnsigned-unsigned.apk
     rm:
       - tools/codegenerator/groovy/
@@ -207,7 +207,7 @@ Builds:
     ndk: r18b
 
 MaintainerNotes: |-
-    groovy.patch was [https://github.com/xbmc/xbmc/issues/6860#issuecomment-461122155 provided by upstream]; it makes the build use the Debian groovy package instead of a prebuilt JAR.
+    18.0-groovy.patch was [https://github.com/xbmc/xbmc/issues/6860#issuecomment-461122155 provided by upstream]; it makes the build use the Debian groovy package instead of a prebuilt JAR.
 
     Build instructions are available [https://github.com/xbmc/xbmc/blob/master/docs/README.Android.md here].
 
diff --git a/metadata/org.xbmc.kodi/groovy.patch b/metadata/org.xbmc.kodi/18.0-groovy.patch
similarity index 100%
rename from metadata/org.xbmc.kodi/groovy.patch
rename to metadata/org.xbmc.kodi/18.0-groovy.patch