diff --git a/PKGBUILD b/PKGBUILD
index 420c9e5..92b0ad4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -27,7 +27,7 @@ source=(https://github.com/symengine/symengine/releases/download/v$pkgver/$pkgna
         flint-3.patch)
 sha256sums=('217b39955dc19f920c6f54c057fdc89e8e155ddee8f0e3c3cacc67b3e3850b64'
             'ef05a806139b35e0336f00cb6960ef6cf483f11b0041e436a99ab1f46bdcb11c'
-            '97533a142635f3e8836d528f8e6a123197a03b0ca30082c061ce8a50a9641827')
+            'a8c45e43dc163f710960770032012a4ff835ccdfe8e7cafe0a1299fdf453da6b')
 
 prepare() {
   patch -d $pkgname-$pkgver -p1 < llvm-shared.patch # Use shared LLVM (Gentoo)
diff --git a/flint-3.patch b/flint-3.patch
index 530d853..502a852 100644
--- a/flint-3.patch
+++ b/flint-3.patch
@@ -1,3 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6ad9d94..f562d5a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -298,8 +298,8 @@ if (WITH_ARB)
+     set(LIBS ${LIBS} ${FLINT_TARGETS})
+     set(PKGS ${PKGS} "FLINT")
+ 
+-    # Workaround for https://github.com/fredrik-johansson/arb/issues/24
+-    include_directories(SYSTEM ${FLINT_INCLUDE_DIRS}/flint)
++#    # Workaround for https://github.com/fredrik-johansson/arb/issues/24
++#    include_directories(SYSTEM ${FLINT_INCLUDE_DIRS}/flint)
+ 
+     set(WITH_FLINT yes)
+     set(HAVE_SYMENGINE_FLINT True)
 diff --git a/cmake/FindARB.cmake b/cmake/FindARB.cmake
 index 281c5bea..f0428e9c 100644
 --- a/cmake/FindARB.cmake
@@ -16,14 +31,16 @@ diff --git a/symengine/eval_arb.h b/symengine/eval_arb.h
 index 8d6f00c1..e162a9ff 100644
 --- a/symengine/eval_arb.h
 +++ b/symengine/eval_arb.h
-@@ -11,6 +11,7 @@
+@@ -11,7 +11,8 @@
  
  #ifdef HAVE_SYMENGINE_ARB
  #include <symengine/basic.h>
+-#include <arb.h>
 +#include <mpfr.h>
- #include <arb.h>
++#include <flint/arb.h>
  
  namespace SymEngine
+ {
 diff --git a/symengine/flint_wrapper.h b/symengine/flint_wrapper.h
 index 21cfcef0..edf07e22 100644
 --- a/symengine/flint_wrapper.h
@@ -61,9 +78,14 @@ diff --git a/symengine/ntheory.cpp b/symengine/ntheory.cpp
 index 6108bf2c..7c6d08a1 100644
 --- a/symengine/ntheory.cpp
 +++ b/symengine/ntheory.cpp
-@@ -17,6 +17,7 @@
- #include "arb.h"
- #include "bernoulli.h"
+@@ -14,9 +14,10 @@
+ #include <primesieve.hpp>
+ #endif // HAVE_SYMENGINE_PRIMESIEVE
+ #ifdef HAVE_SYMENGINE_ARB
+-#include "arb.h"
+-#include "bernoulli.h"
++#include <flint/arb.h>
++#include <flint/bernoulli.h>
  #include "rational.h"
 +#include <flint/fmpq.h>
  #endif // HAVE_SYMENGINE_ARB
@@ -80,3 +102,16 @@ index df9bb61f..0eecf647 100644
 -}
 \ No newline at end of file
 +}
+diff --git a/symengine/utilities/catch/catch.cpp b/symengine/utilities/catch/catch.cpp
+index 7291ac5..d0db607 100644
+--- a/symengine/utilities/catch/catch.cpp
++++ b/symengine/utilities/catch/catch.cpp
+@@ -13,7 +13,7 @@
+ #endif // HAVE_SYMENGINE_MPFR
+ 
+ #if defined(HAVE_SYMENGINE_ARB)
+-#include <arb.h>
++#include <flint/arb.h>
+ #endif // HAVE_SYMENGINE_ARB
+ 
+ using SymEngine::print_stack_on_segfault;