diff --git a/CHANGELOG_VULKANO.md b/CHANGELOG_VULKANO.md
index 90b1a4d4d..d9bbf7bac 100644
--- a/CHANGELOG_VULKANO.md
+++ b/CHANGELOG_VULKANO.md
@@ -11,6 +11,7 @@
 - Pipeline barriers are now correctly inserted when a resource is used more than two times.
 - Update Winit to 0.20.0
 - Update MacOS dependency cocoa to 0.20
+- Propogate new lines correctly in shader compile errors.
 - `Queue` and `QueueFamily` now implement `PartialEq` and `Eq`
 
 # Version 0.16.0 (2019-11-01)
diff --git a/vulkano-shaders/src/lib.rs b/vulkano-shaders/src/lib.rs
index 704b42534..e6e707f4f 100644
--- a/vulkano-shaders/src/lib.rs
+++ b/vulkano-shaders/src/lib.rs
@@ -337,6 +337,10 @@ pub fn shader(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
         full_include_path
     }).collect::<Vec<_>>();
 
-    let content = codegen::compile(path, &root_path, &source_code, input.shader_kind, &include_paths, &input.macro_defines).unwrap();
+    let content = match codegen::compile(path, &root_path, &source_code, input.shader_kind, &include_paths, &input.macro_defines) {
+        Ok(ok) => ok,
+        Err(e) => panic!(e.replace("(s): ", "(s):\n"))
+    };
+
     codegen::reflect("Shader", content.as_binary(), input.dump).unwrap().into()
 }