diff --git a/python-awscrt/fix-timeout.patch b/python-awscrt/fix-timeout.patch
new file mode 100644
index 000000000..28fdb4002
--- /dev/null
+++ b/python-awscrt/fix-timeout.patch
@@ -0,0 +1,26 @@
+diff --git a/test/__init__.py b/test/__init__.py
+index 4b2d44e..50d9313 100644
+--- a/test/__init__.py
++++ b/test/__init__.py
+@@ -14,7 +14,7 @@ from awscrt.io import init_logging, LogLevel
+ import unittest
+ import sys
+ 
+-TIMEOUT = 10.0
++TIMEOUT = 30.0
+ 
+ 
+ class NativeResourceTest(unittest.TestCase):
+diff --git a/test/test_http_client.py b/test/test_http_client.py
+index a9cb459..b9f413a 100644
+--- a/test/test_http_client.py
++++ b/test/test_http_client.py
+@@ -359,7 +359,7 @@ class TestClient(NativeResourceTest):
+         stream.activate()
+ 
+         # wait for stream to complete (use long timeout, it's a big file)
+-        stream_completion_result = stream.completion_future.result(60)
++        stream_completion_result = stream.completion_future.result(80)
+ 
+         # check result
+         self.assertEqual(200, response.status_code)
diff --git a/python-awscrt/riscv64.patch b/python-awscrt/riscv64.patch
new file mode 100644
index 000000000..fb6d86760
--- /dev/null
+++ b/python-awscrt/riscv64.patch
@@ -0,0 +1,30 @@
+--- PKGBUILD
++++ PKGBUILD
+@@ -29,7 +29,8 @@ source=("git+https://github.com/awslabs/aws-crt-python.git#tag=$_tag"
+         "git+https://github.com/awslabs/aws-c-sdkutils"
+         "git+https://github.com/awslabs/aws-checksums"
+         "git+https://github.com/awslabs/aws-lc"
+-        "git+https://github.com/awslabs/s2n")
++        "git+https://github.com/awslabs/s2n"
++        "fix-timeout.patch")
+ sha256sums=('SKIP'
+             'SKIP'
+             'SKIP'
+@@ -43,7 +44,8 @@ sha256sums=('SKIP'
+             'SKIP'
+             'SKIP'
+             'SKIP'
+-            'SKIP')
++            'SKIP'
++            'add2574f4e5a6a079a8513be38a4372da1f6d0e2450f79022e6430f2894c2620')
+ 
+ pkgver() {
+   cd $_pkgname
+@@ -52,6 +54,7 @@ pkgver() {
+ 
+ prepare() {
+   cd $_pkgname
++  patch -Np1 -i $srcdir/fix-timeout.patch
+ 
+   # https://github.com/awslabs/aws-crt-python/blob/v$pkgver/.gitmodules
+   git submodule init