diff --git a/pandoc.rb b/pandoc.rb
index 48d388fd3e255b90b09b47e5839d203fa2e68cf0..3c5eff51026d000205b7eb504d5805d6a23b796f 100644
--- a/pandoc.rb
+++ b/pandoc.rb
@@ -24,7 +24,7 @@ class PandocGenerator < Generator
 
         filename = post.url.gsub(/\.html$/, ".#{output}")
         # Have a filename!
-        filename = "#{post.url.gsub(/\//, "-")}.#{output}" if filename =~ /\/$/
+        filename = "#{post.url.gsub(/\//, "-").gsub(/-$/, "")}.#{output}" if filename =~ /\/$/
 
         filename_with_path = File.join(post_path, filename)