diff --git a/lib/gollum/markup.rb b/lib/gollum/markup.rb
index 6359c528..6e5000cc 100644
--- a/lib/gollum/markup.rb
+++ b/lib/gollum/markup.rb
@@ -200,7 +200,7 @@ module Gollum
           classes << 'frame' if opts['frame']
           %{<span class="#{classes.join(' ')}">} +
           %{<span>} +
-          %{<img src="/#{file.path}" #{attr_string}/>} +
+          %{<img src="#{path}" #{attr_string}/>} +
           (alt ? %{<span>#{alt}</span>} : '') +
           %{</span>} +
           %{</span>}
diff --git a/test/test_markup.rb b/test/test_markup.rb
index 184d270e..8b3b4579 100644
--- a/test/test_markup.rb
+++ b/test/test_markup.rb
@@ -205,6 +205,12 @@ context "Markup" do
     relative_image(content, output)
   end
 
+  test "absolute image with frame" do
+    content = "a\n\n[[http://example.com/bilbo.jpg|frame]]\n\nb"
+    output = "<p>a</p>\n\n<p><span class=\"frame\"><span><img src=\"http://example.com/bilbo.jpg\" /></span></span></p>\n\n<p>b</p>"
+    relative_image(content, output)
+  end
+
   test "image with frame and alt" do
     content = "a\n\n[[alpha.jpg|frame|alt=Alpha]]\n\nb"
     output = "<p>a</p>\n\n<p><span class=\"frame\"><span><img src=\"/greek/alpha.jpg\" alt=\"Alpha\" /><span>Alpha</span></span></span></p>\n\n<p>b</p>"