diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index fa85a250..5f768cc6 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -86,8 +86,8 @@ module Jekyll
     # desired placeholder replacements. For details see "url.rb"
     def url_placeholders
       {
-        :path       => URL.escape_path(@dir),
-        :basename   => URL.escape_path(basename),
+        :path       => @dir,
+        :basename   => basename,
         :output_ext => output_ext
       }
     end
diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb
index 05a5cb8f..2308a33d 100644
--- a/lib/jekyll/post.rb
+++ b/lib/jekyll/post.rb
@@ -208,10 +208,10 @@ module Jekyll
         :year        => date.strftime("%Y"),
         :month       => date.strftime("%m"),
         :day         => date.strftime("%d"),
-        :title       => URL.escape_path(slug),
+        :title       => slug,
         :i_day       => date.strftime("%d").to_i.to_s,
         :i_month     => date.strftime("%m").to_i.to_s,
-        :categories  => (categories || []).map { |c| URL.escape_path(c.to_s) }.join('/'),
+        :categories  => (categories || []).map { |c| c.to_s }.join('/'),
         :short_month => date.strftime("%b"),
         :y_day       => date.strftime("%j"),
         :output_ext  => output_ext
diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb
index 509c94cb..66b4412d 100644
--- a/lib/jekyll/url.rb
+++ b/lib/jekyll/url.rb
@@ -46,7 +46,7 @@ module Jekyll
     # Returns the _unsanitizied_ String URL
     def generate_url
       @placeholders.inject(@template) do |result, token|
-        result.gsub(/:#{token.first}/, token.last)
+        result.gsub(/:#{token.first}/, self.class.escape_path(token.last))
       end
     end