diff --git a/.travis.yml b/.travis.yml
index 3808d7f0..1f75ed84 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,7 @@
+os:
+    - linux
+    - osx
+
 language: rust
 rust:
     - nightly
@@ -7,16 +11,16 @@ cache:
   cargo
 
 install:
-  - export CXX="g++-4.8"
+    - if [[ $TRAVIS_OS_NAME == "linux" ]]; then export CXX="g++-4.8" ; fi
 
 addons:
   apt:
     sources:
     - ubuntu-toolchain-r-test
-    - george-edison55-precise-backports     # recent version of cmake
+    - george-edison55-precise-backports # recent version of cmake
     packages:
     - gcc-4.8
-    - g++-4.8       # required to compile glslang
+    - g++-4.8 # required to compile glslang
     - clang
     - cmake
     - cmake-data
@@ -32,20 +36,25 @@ after_success:
     - |
         [ $TRAVIS_BRANCH = master ] &&
         [ $TRAVIS_PULL_REQUEST = false ] &&
+        [ $TRAVIS_OS_NAME = linux ] &&
         cargo publish --token ${CRATESIO_TOKEN} --manifest-path vk-sys/Cargo.toml
     - |
         [ $TRAVIS_BRANCH = master ] &&
         [ $TRAVIS_PULL_REQUEST = false ] &&
+        [ $TRAVIS_OS_NAME = linux ] &&
         cargo publish --token ${CRATESIO_TOKEN} --manifest-path vulkano/Cargo.toml
     - |
         [ $TRAVIS_BRANCH = master ] &&
         [ $TRAVIS_PULL_REQUEST = false ] &&
+        [ $TRAVIS_OS_NAME = linux ] &&
         cargo publish --token ${CRATESIO_TOKEN} --manifest-path vulkano-win/Cargo.toml
     - |
         [ $TRAVIS_BRANCH = master ] &&
         [ $TRAVIS_PULL_REQUEST = false ] &&
+        [ $TRAVIS_OS_NAME = linux ] &&
         cargo publish --token ${CRATESIO_TOKEN} --manifest-path vulkano-shaders/Cargo.toml
     - |
         [ $TRAVIS_BRANCH = master ] &&
         [ $TRAVIS_PULL_REQUEST = false ] &&
+        [ $TRAVIS_OS_NAME = linux ] &&
         cargo publish --token ${CRATESIO_TOKEN} --manifest-path vulkano-shader-derive/Cargo.toml
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6dc8d016..bb6c75c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased (Breaking)
 
+- Update to winit 0.18
 - Export features and device extensions from the device module instead of the instance module
     +   `instance::Features` -> `device::Features`
     +   `instance::DeviceExtensions` -> `device::DeviceExtensions`
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
index 7c9d65d2..8877c305 100644
--- a/examples/Cargo.toml
+++ b/examples/Cargo.toml
@@ -10,5 +10,5 @@ vulkano-shaders = { path = "../vulkano-shaders" }
 vulkano-win = { path = "../vulkano-win" }
 cgmath = "0.16.1"
 image = "0.20.0"
-winit = "0.17"
+winit = "0.18"
 time = "0.1.38"
diff --git a/vulkano-win/Cargo.toml b/vulkano-win/Cargo.toml
index aeccc498..b5b3dc39 100644
--- a/vulkano-win/Cargo.toml
+++ b/vulkano-win/Cargo.toml
@@ -9,9 +9,9 @@ categories = ["rendering::graphics-api"]
 
 [dependencies]
 vulkano = { version = "0.10.0", path = "../vulkano" }
-winit = "0.17"
+winit = "0.18"
 
 [target.'cfg(target_os = "macos")'.dependencies]
-metal-rs = "0.6"
-cocoa = "0.13"
+metal = "0.13"
+cocoa = "0.18"
 objc = "0.2.2"
diff --git a/vulkano-win/src/lib.rs b/vulkano-win/src/lib.rs
index aa676ee7..fa209e63 100644
--- a/vulkano-win/src/lib.rs
+++ b/vulkano-win/src/lib.rs
@@ -8,7 +8,7 @@ extern crate objc;
 #[cfg(target_os = "macos")]
 extern crate cocoa;
 #[cfg(target_os = "macos")]
-extern crate metal_rs as metal;
+extern crate metal;
 
 use std::borrow::Borrow;
 use std::error;
@@ -59,7 +59,7 @@ pub fn required_extensions() -> InstanceExtensions {
 /// Create a surface from the window type `W`. The surface borrows the window
 /// to prevent it from being dropped before the surface.
 pub fn create_vk_surface<W>(
-    window: W, instance: Arc<Instance>,
+    window: W, instance: Arc<Instance>
 ) -> Result<Arc<Surface<W>>, SurfaceCreationError>
 where
     W: SafeBorrow<winit::Window>,