diff --git a/.gitmodules b/.gitmodules
index cf8e64b..aef07fd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "oss-internship-2020/sapi_libarchive/libarchive"]
-	path = oss-internship-2020/libarchive/libarchive
-	url = https://github.com/libarchive/libarchive
 [submodule "oss-internship-2020/openjpeg/openjpeg"]
 	path = oss-internship-2020/openjpeg/openjpeg
 	url = https://github.com/uclouvain/openjpeg.git
diff --git a/oss-internship-2020/libarchive/CMakeLists.txt b/oss-internship-2020/libarchive/CMakeLists.txt
index 454ecc0..0c79260 100644
--- a/oss-internship-2020/libarchive/CMakeLists.txt
+++ b/oss-internship-2020/libarchive/CMakeLists.txt
@@ -20,9 +20,16 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED 17)
 
 # Build SAPI library
-set(SAPI_ROOT "" CACHE PATH "Path to the Sandboxed API source tree")
+#set(SAPI_ROOT "" CACHE PATH "Path to the Sandboxed API source tree")
+set(SAPI_ROOT "/usr/local/google/home/amedar/internship/sandboxed-api" CACHE PATH "Path to the Sandboxed API source tree")
 
-add_subdirectory(libarchive)
+include(FetchContent)
+FetchContent_Declare(
+  libarchive
+  GIT_REPOSITORY https://github.com/libarchive/libarchive
+  PATCH_COMMAND cd libarchive && patch < ${CMAKE_SOURCE_DIR}/patches/header.patch && patch < ${CMAKE_SOURCE_DIR}/patches/archive_virtual.patch
+)
+  FetchContent_MakeAvailable(libarchive)
 
 add_subdirectory("${SAPI_ROOT}"
   "${CMAKE_BINARY_DIR}/sandboxed-api-build"
@@ -37,8 +44,8 @@ add_sapi_library(
   FUNCTIONS ${FUNCTIONS_LIST}
 
   INPUTS
-  libarchive/libarchive/archive.h
-  libarchive/libarchive/archive_entry.h
+  ${CMAKE_BINARY_DIR}/_deps/libarchive-src/libarchive/archive.h
+  ${CMAKE_BINARY_DIR}/_deps/libarchive-src/libarchive/archive_entry.h
 
   LIBRARY archive_static
   LIBRARY_NAME Libarchive
diff --git a/oss-internship-2020/libarchive/libarchive b/oss-internship-2020/libarchive/libarchive
deleted file mode 160000
index 34940ef..0000000
--- a/oss-internship-2020/libarchive/libarchive
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 34940ef6ea0b21d77cb501d235164ad88f19d40c