diff --git a/Cargo.toml b/Cargo.toml
index 432aa71..cdea96e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "offscreen_gl_context"
 license = "MIT / Apache-2.0"
-version = "0.5.5"
+version = "0.6.0"
 authors = ["Emilio Cobos Álvarez <emilio@crisal.io>", "The Servo Project Developers"]
 description = "Creation and manipulation of HW accelerated offscreen rendering contexts in multiple platforms. Originally intended for the Servo project's WebGL implementation."
 repository = "https://github.com/emilio/rust-offscreen-rendering-context"
@@ -13,7 +13,6 @@ gl_generator = "0.5"
 [features]
 default = []
 osmesa = ["osmesa-sys"]
-serde_serialization = ["serde"]
 # NOTE: Just for testing use, there are no other changes
 test_egl_in_linux = []
 test_osmesa = []
@@ -21,8 +20,8 @@ test_osmesa = []
 [dependencies]
 log  = "0.3"
 gleam = "0.2.31"
-euclid = "0.10"
-serde = { version = "0.8", optional = true }
+euclid = "0.11"
+serde = { version = "0.9", optional = true }
 osmesa-sys = { version = "0.1", optional = true }
 
 [target.x86_64-apple-darwin.dependencies]
diff --git a/src/gl_context_attributes.rs b/src/gl_context_attributes.rs
index 4b351bc..0d855bd 100644
--- a/src/gl_context_attributes.rs
+++ b/src/gl_context_attributes.rs
@@ -15,7 +15,7 @@ pub struct GLContextAttributes {
 
 #[cfg(feature = "serde")]
 impl Deserialize for GLContextAttributes {
-    fn deserialize<D>(deserializer: &mut D) -> Result<Self, D::Error>
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
         where D: Deserializer
     {
         let values = try!(<[_; 6]>::deserialize(deserializer));
@@ -32,7 +32,7 @@ impl Deserialize for GLContextAttributes {
 
 #[cfg(feature = "serde")]
 impl Serialize for GLContextAttributes {
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
         where S: Serializer
     {
         let values = [
diff --git a/src/gl_limits.rs b/src/gl_limits.rs
index 6c23f7a..8ce343f 100644
--- a/src/gl_limits.rs
+++ b/src/gl_limits.rs
@@ -11,7 +11,7 @@ pub struct GLLimits {
 
 #[cfg(feature = "serde")]
 impl Deserialize for GLLimits {
-    fn deserialize<D>(deserializer: &mut D) -> Result<Self, D::Error>
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
         where D: Deserializer
     {
         let values = try!(<[_; 3]>::deserialize(deserializer));
@@ -25,7 +25,7 @@ impl Deserialize for GLLimits {
 
 #[cfg(feature = "serde")]
 impl Serialize for GLLimits {
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
         where S: Serializer
     {
         [self.max_vertex_attribs, self.max_tex_size, self.max_cube_map_tex_size]