diff --git a/server/pypi/packages/chaquopy-ffmpeg/build.sh b/server/pypi/packages/chaquopy-ffmpeg/build.sh
new file mode 100755
index 0000000000..36fb0c67fd
--- /dev/null
+++ b/server/pypi/packages/chaquopy-ffmpeg/build.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+export ANDROID_SDK_HOME=$ANDROID_HOME
+export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/22.1.7171670
+
+set -eu
+
+./ffmpeg-android-maker.sh
\ No newline at end of file
diff --git a/server/pypi/packages/chaquopy-ffmpeg/meta.yaml b/server/pypi/packages/chaquopy-ffmpeg/meta.yaml
new file mode 100644
index 0000000000..dc30aca5d2
--- /dev/null
+++ b/server/pypi/packages/chaquopy-ffmpeg/meta.yaml
@@ -0,0 +1,11 @@
+{% set version = "2.8.4" %}
+
+package:
+  name: chaquopy-ffmpeg
+  version: {{ version }} 
+
+build:
+  number: 0
+
+source:
+  url: https://github.com/Javernaut/ffmpeg-android-maker/archive/refs/tags/v{{version}}.tar.gz
\ No newline at end of file
diff --git a/server/pypi/packages/chaquopy-ffmpeg/test/__init__.py b/server/pypi/packages/chaquopy-ffmpeg/test/__init__.py
new file mode 100644
index 0000000000..8b70850c46
--- /dev/null
+++ b/server/pypi/packages/chaquopy-ffmpeg/test/__init__.py
@@ -0,0 +1,13 @@
+import unittest
+
+class TestFFmpegPackage(unittest.TestCase):
+
+    def test_input_output(self):
+        import ffmpeg
+
+        self.input_file = 'input.mp4'
+        self.output_file = 'output.mp4'
+        stream = ffmpeg.input(self.input_file).output(self.output_file)
+        args = stream.get_args()
+        expected_args = ['-i', self.input_file, self.output_file]
+        self.assertEqual(args, expected_args)
diff --git a/server/pypi/packages/chaquopy-ffmpeg/test/input.mp4 b/server/pypi/packages/chaquopy-ffmpeg/test/input.mp4
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/server/pypi/packages/chaquopy-ffmpeg/test/output.mp4 b/server/pypi/packages/chaquopy-ffmpeg/test/output.mp4
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/server/pypi/pkgtest/app/build.gradle b/server/pypi/pkgtest/app/build.gradle
index 5391f5f956..0e560684d6 100644
--- a/server/pypi/pkgtest/app/build.gradle
+++ b/server/pypi/pkgtest/app/build.gradle
@@ -15,6 +15,7 @@ def PROTOBUF_REQ = "protobuf<4.25"
 ext.TEST_PACKAGES = [
     "argon2-cffi-bindings": ["argon2-cffi"],
     "backports-zoneinfo": ["tzdata"],
+    "chaquopy-ffmpeg": ["ffmpeg-python"],
     "dlib": ["numpy"],
     "grpcio": [PROTOBUF_REQ],
     "photutils": ["scipy"],