diff --git a/Cargo.lock b/Cargo.lock
index 2827097..272353c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -604,7 +604,7 @@ dependencies = [
 [[package]]
 name = "glutin"
 version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/tomaka/glutin?rev=23b3b101e554e521f38c1179f90d3d2f278b857c#23b3b101e554e521f38c1179f90d3d2f278b857c"
 dependencies = [
  "android_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "cgl 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -614,6 +614,7 @@ dependencies = [
  "gl_generator 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "objc 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "shared_library 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1696,7 +1697,7 @@ dependencies = [
  "clipboard 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "collision 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "flate2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "glutin 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glutin 0.19.0 (git+https://github.com/tomaka/glutin?rev=23b3b101e554e521f38c1179f90d3d2f278b857c)",
  "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "image 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2234,7 +2235,7 @@ dependencies = [
 "checksum gl_generator 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a0ffaf173cf76c73a73e080366bf556b4776ece104b06961766ff11449f38604"
 "checksum gl_generator 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a795170cbd85b5a7baa58d6d7525cae6a03e486859860c220f7ebbbdd379d0a"
 "checksum gleam 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "4b47f5b15742aee359c7895ab98cf2cceecc89bb4feb6f4e42f802d7899877da"
-"checksum glutin 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "535c6eda58adbb227604b2db10a022ffd6339d7ea3e970f338e7d98aeb24fcc3"
+"checksum glutin 0.19.0 (git+https://github.com/tomaka/glutin?rev=23b3b101e554e521f38c1179f90d3d2f278b857c)" = "<none>"
 "checksum h2 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "ddb2b25a33e231484694267af28fec74ac63b5ccf51ee2065a5e313b834d836e"
 "checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
 "checksum http 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "1a10e5b573b9a0146545010f50772b9e8b1dd0a256564cc4307694c68832a2f5"
diff --git a/Cargo.toml b/Cargo.toml
index cec4404..073bf8c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@ opt-level = 1
 
 [dependencies]
 sha-1 = "0.8.1"
-glutin = "0.19.0"
+glutin = { git = "https://github.com/tomaka/glutin", rev = "23b3b101e554e521f38c1179f90d3d2f278b857c" }
 byteorder = "1.2.7"
 reqwest = "0.9.10"
 serde = "1.0.88"
diff --git a/src/gl/mod.rs b/src/gl/mod.rs
index 7a1fe3d..efce7d1 100644
--- a/src/gl/mod.rs
+++ b/src/gl/mod.rs
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 extern crate steven_gl as gl;
-use glutin::GlContext;
+use glutin::ContextTrait;
 
 use std::ops::BitOr;
 use std::ffi;
@@ -22,7 +22,7 @@ use std::ptr;
 use std::ops::{Deref, DerefMut};
 
 /// Inits the gl library. This should be called once a context is ready.
-pub fn init(vid: & glutin::GlWindow) {
+pub fn init(vid: & glutin::CombinedContext) {
     gl::load_with(|s| vid.get_proc_address(s) as *const _);
 }
 
diff --git a/src/main.rs b/src/main.rs
index 4fb33c4..b180b83 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -48,7 +48,7 @@ use std::thread;
 use std::sync::mpsc;
 use crate::protocol::mojang;
 use glutin;
-use glutin::GlContext;
+use glutin::ContextTrait;
 
 const CL_BRAND: console::CVar<String> = console::CVar {
     ty: PhantomData,
@@ -199,7 +199,7 @@ fn main() {
         .with_gl(glutin::GlRequest::GlThenGles{opengl_version: (3, 2), opengles_version: (2, 0)})
         .with_gl_profile(glutin::GlProfile::Core)
         .with_vsync(vsync);
-    let mut window = glutin::GlWindow::new(window_builder, context, &events_loop)
+    let mut window = glutin::CombinedContext::new(window_builder, context, &events_loop)
         .expect("Could not create glutin window.");
 
     unsafe {
@@ -304,7 +304,7 @@ fn main() {
     }
 }
 
-fn handle_window_event(window: &mut glutin::GlWindow,
+fn handle_window_event(window: &mut glutin::CombinedContext,
                        game: &mut Game,
                        ui_container: &mut ui::Container,
                        event: glutin::Event) {