diff --git a/helpers/DATA/pygame/update_surface_test.patch b/helpers/DATA/pygame/update_surface_test.patch
new file mode 100644
index 0000000..a587991
--- /dev/null
+++ b/helpers/DATA/pygame/update_surface_test.patch
@@ -0,0 +1,22 @@
+diff --git a/test/surface_test.py b/test/surface_test.py
+index 4323503..1c161ad 100644
+--- a/test/surface_test.py
++++ b/test/surface_test.py
+#@@ -1481,7 +1481,7 @@ class GeneralSurfaceTests(AssertRaisesRegexMixin, unittest.TestCase):
+#         self.assertEqual(results, results_expected)
+# 
+#     @unittest.skipIf(
+#-        "arm" in platform.machine() or "aarch64" in platform.machine() or "mips" in platform.machine() or "ppc64le" in platform.machine() or "s390x" in platform.machine(),
+#+        "arm" in platform.machine() or "aarch64" in platform.machine() or "mips" in platform.machine() or "ppc64le" in platform.machine() or "s390x" in platform.machine() or "riscv64" in platform.machine(),
+#         "sdl2 blitter produces different results on arm",
+#     )
+#     def test_src_alpha_sdl2_blitter(self):
+@@ -2013,7 +2013,7 @@ class GeneralSurfaceTests(AssertRaisesRegexMixin, unittest.TestCase):
+             mask8 = (224, 28, 3, 0)
+             mask15 = (31744, 992, 31, 0)
+             mask16 = (63488, 2016, 31, 0)
+-            mask24 = (4278190080, 16711680, 65280, 0)
++            mask24 = (16711680, 65280, 255, 0)
+             mask32 = (4278190080, 16711680, 65280, 255)
+ 
+             # Surfaces with standard depths and masks
diff --git a/helpers/make-pygame b/helpers/make-pygame
new file mode 100644
index 0000000..1489c3b
--- /dev/null
+++ b/helpers/make-pygame
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+#    Copyright (C) 2024 Luis Guzmán <ark@switnet.org>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+
+VERSION=0
+BUILD_UNTIL=11.0
+
+. ./config
+
+patch --no-backup-if-mismatch -p1 < $DATA/update_surface_test.patch
+
+changelog "Rebuild to use the latest SDL support on aramo."
+
+package