diff --git a/lib/jekyll/converters/markdown/kramdown_parser.rb b/lib/jekyll/converters/markdown/kramdown_parser.rb
index ea8053db1..9b6d55ccc 100644
--- a/lib/jekyll/converters/markdown/kramdown_parser.rb
+++ b/lib/jekyll/converters/markdown/kramdown_parser.rb
@@ -37,7 +37,12 @@ module Jekyll
         end
 
         def convert(content)
-          Kramdown::Document.new(content, @config).to_html
+          document = Kramdown::Document.new(content, @config)
+          html_output = document.to_html
+          document.warnings.each do |warning|
+            Jekyll.logger.warn "Kramdown warning:", warning
+          end
+          html_output
         end
 
         private
diff --git a/lib/jekyll/converters/smartypants.rb b/lib/jekyll/converters/smartypants.rb
index 37fecb121..16161e1dc 100644
--- a/lib/jekyll/converters/smartypants.rb
+++ b/lib/jekyll/converters/smartypants.rb
@@ -29,7 +29,12 @@ module Jekyll
       end
 
       def convert(content)
-        Kramdown::Document.new(content, @config).to_html.chomp
+        document = Kramdown::Document.new(content, @config)
+        html_output = document.to_html.chomp
+        document.warnings.each do |warning|
+          Jekyll.logger.warn "Kramdown warning:", warning
+        end
+        html_output
       end
     end
   end
diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb
index 2a12a0907..80bcced34 100644
--- a/test/test_kramdown.rb
+++ b/test/test_kramdown.rb
@@ -56,6 +56,12 @@ class TestKramdown < JekyllUnitTest
       assert_equal "<h1>Some Header</h1>", @markdown.convert("# Some Header #").strip
     end
 
+    should "should log kramdown warnings" do
+      allow_any_instance_of(Kramdown::Document).to receive(:warnings).and_return(["foo"])
+      expect(Jekyll.logger).to receive(:warn).with("Kramdown warning:", "foo")
+      @markdown.convert("Something")
+    end
+
     context "when asked to convert smart quotes" do
       should "convert" do
         assert_match(