diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..8e852dd0
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "external/ezfio"]
+	path = external/ezfio
+	url = https://gitlab.com/scemama/ezfio
+[submodule "external/irpf90"]
+	path = external/irpf90
+	url = https://gitlab.com/scemama/irpf90
diff --git a/configure b/configure
index 54bf70ae..2ed5dc0b 100755
--- a/configure
+++ b/configure
@@ -14,15 +14,16 @@ unset CCXX
 # Force GCC instead of ICC for dependencies
 export CC=gcc
 
+# Download submodules
+git submodule init
+git submodule update
 
 # /!\ When updating version, update also etc files
-EZFIO_TGZ="EZFIO-v2.0.6.tar.gz"
 BATS_URL="https://github.com/bats-core/bats-core/archive/v1.1.0.tar.gz"
 BUBBLE_URL="https://github.com/projectatomic/bubblewrap/releases/download/v0.3.3/bubblewrap-0.3.3.tar.xz"
 DOCOPT_URL="https://github.com/docopt/docopt/archive/0.6.2.tar.gz"
 BSE_URL="https://github.com/MolSSI-BSE/basis_set_exchange/archive/v0.8.11.tar.gz"
 F77ZMQ_URL="https://github.com/scemama/f77_zmq/archive/v4.2.5.tar.gz"
-IRPF90_URL="https://gitlab.com/scemama/irpf90/-/archive/v2.0.4/irpf90-v2.0.4.tar.gz"
 LIBCAP_URL="https://git.kernel.org/pub/scm/linux/kernel/git/morgan/libcap.git/snapshot/libcap-2.25.tar.gz"
 NINJA_URL="https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip"
 OCAML_URL="https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh"
@@ -176,15 +177,10 @@ function find_dir() {
 }
 
 
-# Extract EZFIO if needed
-EZFIO=$(find_dir "${QP_ROOT}"/external/ezfio)
-if [[ ${EZFIO} = $(not_found) ]] ; then
-            execute << EOF
-              cd "\${QP_ROOT}"/external
-              tar --gunzip --extract --file ${EZFIO_TGZ}
-              rm -rf ezfio
-              mv EZFIO ezfio || mv EZFIO-v*/ ezfio
-EOF
+# Install IRPF90 if needed
+IRPF90=$(find_exe irpf90)
+if [[ ${IRPF90} = $(not_found) ]] ; then
+        make -C ${QP_ROOT}/external/irpf90
 fi
 
 
@@ -259,8 +255,6 @@ EOF
 
     elif [[ ${PACKAGE} = irpf90 ]] ; then
 
-            # When changing version of irpf90, don't forget to update etc/irpf90.rc
-            download ${IRPF90_URL} "${QP_ROOT}"/external/irpf90.tar.gz
             execute << EOF
               cd "\${QP_ROOT}"/external
               tar --gunzip --extract --file irpf90.tar.gz
diff --git a/external/.gitignore b/external/.gitignore
index 241e560d..676c79b7 100644
--- a/external/.gitignore
+++ b/external/.gitignore
@@ -1,2 +1,2 @@
-*
+#*
 
diff --git a/external/EZFIO-v2.0.6.tar.gz b/external/EZFIO-v2.0.6.tar.gz
deleted file mode 100644
index 0859b7a0..00000000
Binary files a/external/EZFIO-v2.0.6.tar.gz and /dev/null differ
diff --git a/external/ezfio b/external/ezfio
new file mode 160000
index 00000000..ccee52d0
--- /dev/null
+++ b/external/ezfio
@@ -0,0 +1 @@
+Subproject commit ccee52d00c2cde1d628b0d34f4a247143747bf36
diff --git a/external/irpf90 b/external/irpf90
new file mode 160000
index 00000000..132a4a16
--- /dev/null
+++ b/external/irpf90
@@ -0,0 +1 @@
+Subproject commit 132a4a1661c9878d21dcbf0ac14f7fe9a3b110d0