diff --git a/.circleci/config.yml b/.circleci/config.yml
index 831abb9568b..4d0722cfb8b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -153,7 +153,8 @@ jobs:
       - run:
           name: "Pull dependencies"
           command: |
-            git clone git@github.com:wasmerio/wapm-cli.git
+            git submodule init
+            git submodule update --remote
       - restore_cache:
           keys:
             - v8-cargo-cache-linux-nightly-{{ arch }}-{{ checksum "Cargo.lock" }}
@@ -220,7 +221,8 @@ jobs:
       - run:
           name: "Pull dependencies"
           command: |
-            git clone git@github.com:wasmerio/wapm-cli.git
+            git submodule init
+            git submodule update --remote
       - restore_cache:
           keys:
             - v8-cargo-cache-darwin-nightly-{{ arch }}-{{ checksum "Cargo.lock" }}
@@ -238,7 +240,7 @@ jobs:
       - run:
           name: Install Rust
           command: |
-            curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly-2019-04-11
+            curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly
             export PATH="$HOME/.cargo/bin:$PATH"
             cargo --version
       # Use rust nightly (for singlepass, for now)
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000000..ea4c03efb99
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "wapm-cli"]
+	path = wapm-cli
+	url = git@github.com:wasmerio/wapm-cli.git
diff --git a/wapm-cli b/wapm-cli
new file mode 160000
index 00000000000..c9399f3fb11
--- /dev/null
+++ b/wapm-cli
@@ -0,0 +1 @@
+Subproject commit c9399f3fb117c8ab1cbaf17b02bd5aeefb8e8e54