diff --git a/.ci_scripts/install_dependencies.sh b/.ci_scripts/install_dependencies.sh
index bfa6edd856..faca5f48e4 100755
--- a/.ci_scripts/install_dependencies.sh
+++ b/.ci_scripts/install_dependencies.sh
@@ -64,6 +64,11 @@ function install_sdl_macos {
   mkdir -p ~/Library/Frameworks
   echo "Installing framework:" "/Volumes/SDL2"/*.framework
   cp -rp "$VOLUME"/*.framework ~/Library/Frameworks
+  if [ -d "$VOLUME/optional" ]
+  then
+    echo "Installing optional framework:" "/Volumes/SDL2/optional"/*.framework
+    cp -rp "$VOLUME"/optional/*.framework ~/Library/Frameworks
+  fi
   hdiutil detach "$VOLUME"
 }
 
diff --git a/android/SDL2/build.gradle b/android/SDL2/build.gradle
index 7ee65c082a..ad2ce49b6f 100644
--- a/android/SDL2/build.gradle
+++ b/android/SDL2/build.gradle
@@ -47,7 +47,8 @@ android {
                 arguments 'SUPPORT_FLAC=false',
                         'SUPPORT_OGG=false',
                         'SUPPORT_MOD_MODPLUG=false',
-                        'SUPPORT_MID_TIMIDITY=false'
+                        'SUPPORT_MID_TIMIDITY=false',
+                        'SUPPORT_WAVPACK=false'
             }
         }
     }