diff --git a/.gitmodules b/.gitmodules
index cc60014..ca92468 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "modules/cgmath"]
 	path = modules/cgmath
 	url = https://github.com/bjz/cgmath-rs
+[submodule "modules/OculusSDK"]
+	path = modules/OculusSDK
+	url = https://github.com/jherico/OculusSDK.git
diff --git a/configure b/configure
index 9dda637..07e443a 100755
--- a/configure
+++ b/configure
@@ -173,10 +173,10 @@ modules = [Bin("oculus-info", ["oculus-vr"]),
            Lib("cgmath")]
 
 if platform.system() == "Linux":
-    modules += [Lib("oculus-vr", ["libovr.a", "cgmath"]),
-                LibMakefile("libovr.a",
-                            "modules/OculusSDK/",
-                            "modules/OculusSDK/LibOVR/Lib/Linux/Release/x86_64/libovr.a")]
+    modules += [Lib("oculus-vr", ["libOVR_C.so", "cgmath"]),
+                LibCMake("libOVR_C.so",
+                         "modules/OculusSDK/",
+                         "modules/OculusSDK/output/libOVR_C.so")]
 
 elif platform.system() == "Darwin":
     modules += [Lib("oculus-vr", ["libovr.a", "cgmath"])]
diff --git a/modules/OculusSDK b/modules/OculusSDK
new file mode 160000
index 0000000..ccd12dd
--- /dev/null
+++ b/modules/OculusSDK
@@ -0,0 +1 @@
+Subproject commit ccd12dd9b28d52190d11267a937124eff586b89d
diff --git a/src/oculus-vr/lib.rs b/src/oculus-vr/lib.rs
index a9468ba..f32eaf8 100644
--- a/src/oculus-vr/lib.rs
+++ b/src/oculus-vr/lib.rs
@@ -15,7 +15,7 @@ use cgmath::vector::{Vector2, Vector3};
 use cgmath::matrix::{Matrix4};
 
 #[cfg(target_os = "linux")]
-#[link(name="ovr")]
+#[link(name="OVR_C")]
 #[link(name="stdc++")]
 #[link(name="udev")]
 #[link(name="Xinerama")]
@@ -25,7 +25,7 @@ use cgmath::matrix::{Matrix4};
 extern {}
  
 #[cfg(target_os = "macos")]
-#[link(name="ovr")]
+#[link(name="OVR_C")]
 #[link(name="stdc++")]
 #[link(name = "Cocoa", kind = "framework")]
 #[link(name = "IOKit", kind = "framework")]