diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index b8cf0b78..be6d120e 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -173,7 +173,7 @@ module Jekyll
       # recursively render layouts
       layout = layouts[data["layout"]]
 
-      Jekyll.logger.warn("Build Warning:", "Layout #{data["layout"]} does not exist.") if invalid_layout? layout
+      Jekyll.logger.warn("Build Warning:", "Layout '#{data["layout"]}' requested in #{relative_path} does not exist.") if invalid_layout? layout
 
       used = Set.new([layout])
 
diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb
index c43f605d..19ec14c7 100644
--- a/lib/jekyll/renderer.rb
+++ b/lib/jekyll/renderer.rb
@@ -111,7 +111,7 @@ module Jekyll
       output = content.dup
       layout = site.layouts[document.data["layout"]]
 
-      Jekyll.logger.warn("Build Warning:", "Layout #{document.data["layout"]} does not exist.") if invalid_layout? layout
+      Jekyll.logger.warn("Build Warning:", "Layout '#{document.data["layout"]}' requested in #{document.relative_path} does not exist.") if invalid_layout? layout
 
       used   = Set.new([layout])