diff --git a/Cargo.lock b/Cargo.lock
index 64c760e..9739747 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6,7 +6,7 @@ dependencies = [
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "multiboot2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rlibc 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "spin 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "spin 0.4.5 (git+https://github.com/messense/spin-rs?rev=020f1b3)",
  "volatile 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "x86 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -209,7 +209,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "spin"
 version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/messense/spin-rs?rev=020f1b3#020f1b3f160a1facf54355278af14cbf6a1613fd"
 
 [[package]]
 name = "volatile"
@@ -256,6 +256,6 @@ dependencies = [
 "checksum serde 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)" = "c97b18e9e53de541f11e497357d6c5eaeb39f0cb9c8734e274abe4935f6991fa"
 "checksum serde_json 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b5aaee47e038bf9552d30380d3973fff2593ee0a76d81ad4c581f267cdcadf36"
 "checksum siphasher 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0df90a788073e8d0235a67e50441d47db7c8ad9debd91cbf43736a2a92d36537"
-"checksum spin 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1d16a26e2b789f86aabddbe91cb82ee2e822beb8a59840d631941b625ef77e53"
+"checksum spin 0.4.5 (git+https://github.com/messense/spin-rs?rev=020f1b3)" = "<none>"
 "checksum volatile 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6633c5250f16598f92b48272265ce9f8179447f702f0ba0cb640c5be6537b0c0"
 "checksum x86 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ada1976e1004a0b5999beb7403541af96637e8f439b97d86c8c9abef2e0e7d19"
diff --git a/Cargo.toml b/Cargo.toml
index 8d40d5e..d5a16b7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,12 +8,15 @@ crate-type = ["staticlib"]
 
 [dependencies]
 rlibc = "1.0"
-spin = "0.4.5"
 volatile = "0.2"
 x86 = "0.8"
 multiboot2 = "0.3.2"
 bitflags = "0.9"
 
+[dependencies.spin]
+git = "https://github.com/messense/spin-rs"
+rev = "020f1b3"
+
 [dependencies.log]
 version = "0.3"
 default-features = false