diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000..28922f40c6
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "smoltcp"]
+	path = smoltcp
+	url = https://gitlab.redox-os.org/redox-os/smoltcp.git
diff --git a/Cargo.lock b/Cargo.lock
index 54538ecc39..f68f998555 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -476,7 +476,7 @@ dependencies = [
  "netutils 0.1.0 (git+https://gitlab.redox-os.org/redox-os/netutils.git)",
  "redox_event 0.1.0 (git+https://gitlab.redox-os.org/redox-os/event.git)",
  "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
- "smoltcp 0.5.0 (git+https://github.com/m-labs/smoltcp.git?rev=ed8dce015c45ee6e37c8d671f290a6d9b7fb49ac)",
+ "smoltcp 0.5.0",
 ]
 
 [[package]]
@@ -572,10 +572,10 @@ dependencies = [
 [[package]]
 name = "smoltcp"
 version = "0.5.0"
-source = "git+https://github.com/m-labs/smoltcp.git?rev=ed8dce015c45ee6e37c8d671f290a6d9b7fb49ac#ed8dce015c45ee6e37c8d671f290a6d9b7fb49ac"
 dependencies = [
  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "managed 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -948,7 +948,6 @@ dependencies = [
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 "checksum slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5f9776d6b986f77b35c6cf846c11ad986ff128fe0b2b63a3628e3755e8d3102d"
 "checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db"
-"checksum smoltcp 0.5.0 (git+https://github.com/m-labs/smoltcp.git?rev=ed8dce015c45ee6e37c8d671f290a6d9b7fb49ac)" = "<none>"
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
 "checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
 "checksum time 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "847da467bf0db05882a9e2375934a8a55cffdc9db0d128af1518200260ba1f6c"
diff --git a/Cargo.toml b/Cargo.toml
index c34d1e8901..e9c64b4307 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,8 +27,7 @@ default-features = false
 features = ["release_max_level_off"]
 
 [dependencies.smoltcp]
-git = "https://github.com/m-labs/smoltcp.git"
-rev = "ed8dce015c45ee6e37c8d671f290a6d9b7fb49ac"
+path = "smoltcp"
 default-features = false
 features = ["std", "socket-raw", "proto-ipv4", "socket-udp", "socket-tcp", "socket-icmp"]
 
diff --git a/smoltcp b/smoltcp
new file mode 160000
index 0000000000..30793fc901
--- /dev/null
+++ b/smoltcp
@@ -0,0 +1 @@
+Subproject commit 30793fc901dc3a836e3177cc2b1e782389748fd5