diff --git a/CHANGELOG_VULKANO.md b/CHANGELOG_VULKANO.md
index 47ff91b2..532326fe 100644
--- a/CHANGELOG_VULKANO.md
+++ b/CHANGELOG_VULKANO.md
@@ -1,5 +1,6 @@
 # Unreleased
 
+- Update shaderc to 0.6. This again allows to use locally installed libraries which reduces the build-time significantly on Arch/Voidlinux (see https://github.com/google/shaderc-rs/issues/58)
 - Removed faulty debug_assert in `SwapchainAcquireFuture::drop`.
 
 # Version 0.13.0 (2019-07-02)
diff --git a/vulkano-shaders/Cargo.toml b/vulkano-shaders/Cargo.toml
index 39981c3a..0f3d2963 100644
--- a/vulkano-shaders/Cargo.toml
+++ b/vulkano-shaders/Cargo.toml
@@ -15,10 +15,13 @@ categories = ["rendering::graphics-api"]
 proc-macro = true
 
 [dependencies]
-shaderc = "0.5"
+shaderc = "0.6"
 syn = "0.15"
 quote = "0.6"
 proc-macro2 = "0.4"
 
 [dev-dependencies]
 vulkano = { version = "0.13", path = "../vulkano" }
+
+[features]
+shaderc-build-from-source = ["shaderc/build-from-source"]